expo-modules-core 1.12.16 → 1.12.17

package/CHANGELOG.md

@@ -10,6 +10,18 @@
 
 ### 💡 Others
 
+## 1.12.17 — 2024-06-27
+
+### 🐛 Bug fixes
+
+- [Android] Reduce the number of global references to JSIContext. ([#29936](https://github.com/expo/expo/pull/29936) by [@lukmccall](https://github.com/lukmccall))
+- Fixed `getPathPermissions` permission error for local path with spaces on iOS 16 and older. ([#29958](https://github.com/expo/expo/pull/29958) by [@kudo](https://github.com/kudo))
+- [iOS] Fixed broken `addUIBlock` and `executeUIBlock` on New Architecture mode. ([#30030](https://github.com/expo/expo/pull/30030) by [@kudo](https://github.com/kudo))
+
+### 💡 Others
+
+- [iOS] Exposed `Utilities` class for Expo Modules common tasks. ([#29945](https://github.com/expo/expo/pull/29945) by [@kudo](https://github.com/kudo))
+
 ## 1.12.16 — 2024-06-20
 
 ### 🐛 Bug fixes

package/android/build.gradle

@@ -1,7 +1,7 @@
 apply plugin: 'com.android.library'
 
 group = 'host.exp.exponent'
-version = '1.12.16'
+version = '1.12.17'
 
 def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
 apply from: expoModulesCorePlugin
@@ -63,7 +63,7 @@ android {
   defaultConfig {
     consumerProguardFiles 'proguard-rules.pro'
     versionCode 1
-    versionName "1.12.16"
+    versionName "1.12.17"
     buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled.toString()
 
     testInstrumentationRunner "expo.modules.TestRunner"

package/android/src/main/cpp/JSIContext.cpp

@@ -29,42 +29,6 @@ namespace expo {
 
 #endif
 
-/*
- * A wrapper for a global reference that can be deallocated on any thread.
- * It should be used with smart pointer. That structure can't be copied or moved.
- */
-template <typename T>
-class ThreadSafeJNIGlobalRef {
-public:
-  ThreadSafeJNIGlobalRef(jobject globalRef) : globalRef(globalRef) {}
-  ThreadSafeJNIGlobalRef(const ThreadSafeJNIGlobalRef &other) = delete;
-  ThreadSafeJNIGlobalRef(ThreadSafeJNIGlobalRef &&other) = delete;
-  ThreadSafeJNIGlobalRef &operator=(const ThreadSafeJNIGlobalRef &other) = delete;
-  ThreadSafeJNIGlobalRef &operator=(ThreadSafeJNIGlobalRef &&other) = delete;
-
-  void use(std::function<void(jni::alias_ref<T> globalRef)> &&action) {
-    if (globalRef == nullptr) {
-      throw std::runtime_error("ThreadSafeJNIGlobalRef: globalRef is null");
-    }
-
-    jni::ThreadScope::WithClassLoader([this, action = std::move(action)]() {
-      jni::alias_ref<jobject> aliasRef = jni::wrap_alias(globalRef);
-      jni::alias_ref<T> jsiContextRef = jni::static_ref_cast<T>(aliasRef);
-      action(jsiContextRef);
-    });
-  }
-
-  ~ThreadSafeJNIGlobalRef() {
-    if (globalRef != nullptr) {
-      jni::ThreadScope::WithClassLoader([this] {
-        jni::Environment::current()->DeleteGlobalRef(this->globalRef);
-      });
-    }
-  }
-
-  jobject globalRef;
-};
-
 jni::local_ref<JSIContext::jhybriddata>
 JSIContext::initHybrid(jni::alias_ref<jhybridobject> jThis) {
   return makeCxxInstance(jThis);
@@ -90,7 +54,10 @@ void JSIContext::registerNatives() {
 }
 
 JSIContext::JSIContext(jni::alias_ref<jhybridobject> jThis)
-  : javaPart_(jni::make_global(jThis)) {}
+  : javaPart_(jni::make_global(jThis)),
+    threadSafeJThis(std::make_shared<ThreadSafeJNIGlobalRef<JSIContext::javaobject>>(
+      jni::Environment::current()->NewGlobalRef(javaPart_.get())
+    )) {}
 
 JSIContext::~JSIContext() {
   if (runtimeHolder) {
@@ -368,15 +335,11 @@ void JSIContext::jniSetNativeStateForSharedObject(
   int id,
   jni::alias_ref<JavaScriptObject::javaobject> jsObject
 ) {
-  auto threadSafeRef = std::make_shared<ThreadSafeJNIGlobalRef<JSIContext::javaobject>>(
-    jni::Environment::current()->NewGlobalRef(javaPart_.get())
-  );
-
   auto nativeState = std::make_shared<expo::SharedObject::NativeState>(
     id,
     // We can't predict the order of deallocation of the JSIContext and the SharedObject.
     // So we need to pass a new ref to retain the JSIContext to make sure it's not deallocated before the SharedObject.
-    [threadSafeRef = std::move(threadSafeRef)](const SharedObject::ObjectId objectId) {
+    [threadSafeRef = threadSafeJThis](const SharedObject::ObjectId objectId) {
       threadSafeRef->use([objectId](jni::alias_ref<JSIContext::javaobject> globalRef) {
         JSIContext::deleteSharedObject(globalRef, objectId);
       });

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

@@ -9,6 +9,7 @@
 #include "JavaReferencesCache.h"
 #include "JSReferencesCache.h"
 #include "JNIDeallocator.h"
+#include "ThreadSafeJNIGlobalRef.h"
 
 #include <fbjni/fbjni.h>
 #include <jsi/jsi.h>
@@ -149,10 +150,20 @@ public:
 
 private:
   friend HybridBase;
+
+  /*
+   * We store two global references to the Java part of the JSIContext.
+   * However, one is wrapped in additional abstraction to make it thread-safe,
+   * which increase the access time. For most operations, we should use the bare reference.
+   * Only for operations that are executed on different threads that aren't attached to JVM,
+   * we should use the thread-safe reference.
+   */
   jni::global_ref<JSIContext::javaobject> javaPart_;
+  std::shared_ptr<ThreadSafeJNIGlobalRef<JSIContext::javaobject>> threadSafeJThis;
 
   bool wasDeallocated_ = false;
 
+
   explicit JSIContext(jni::alias_ref<jhybridobject> jThis);
 
   inline jni::local_ref<JavaScriptModuleObject::javaobject>

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

@@ -0,0 +1,49 @@
+// Copyright © 2021-present 650 Industries, Inc. (aka Expo)
+
+#pragma once
+
+#include <fbjni/fbjni.h>
+#include <android/log.h>
+
+namespace jni = facebook::jni;
+
+namespace expo {
+
+/*
+ * A wrapper for a global reference that can be deallocated on any thread.
+ * It should be used with smart pointer. That structure can't be copied or moved.
+ */
+template<typename T>
+class ThreadSafeJNIGlobalRef {
+public:
+  ThreadSafeJNIGlobalRef(jobject globalRef) : globalRef(globalRef) {}
+  ThreadSafeJNIGlobalRef(const ThreadSafeJNIGlobalRef &other) = delete;
+  ThreadSafeJNIGlobalRef(ThreadSafeJNIGlobalRef &&other) = delete;
+  ThreadSafeJNIGlobalRef &operator=(const ThreadSafeJNIGlobalRef &other) = delete;
+  ThreadSafeJNIGlobalRef &operator=(ThreadSafeJNIGlobalRef &&other) = delete;
+
+  void use(std::function<void(jni::alias_ref<T> globalRef)> &&action) {
+    if (globalRef == nullptr) {
+      __android_log_print(ANDROID_LOG_WARN, "ExpoModulesCore", "ThreadSafeJNIGlobalRef was used after deallocation.");
+      return;
+    }
+
+    jni::ThreadScope::WithClassLoader([this, action = std::move(action)]() {
+      jni::alias_ref<jobject> aliasRef = jni::wrap_alias(globalRef);
+      jni::alias_ref<T> jsiContextRef = jni::static_ref_cast<T>(aliasRef);
+      action(jsiContextRef);
+    });
+  }
+
+  ~ThreadSafeJNIGlobalRef() {
+    if (globalRef != nullptr) {
+      jni::ThreadScope::WithClassLoader([this] {
+        jni::Environment::current()->DeleteGlobalRef(this->globalRef);
+      });
+    }
+  }
+
+  jobject globalRef;
+};
+
+} // namespace expo

package/ios/FileSystemUtilities/FileSystemLegacyUtilities.swift

@@ -82,7 +82,7 @@ public class FileSystemLegacyUtilities: NSObject, EXInternalModule, EXFileSystem
 
   @objc
   public func getPathPermissions(_ path: String) -> EXFileSystemPermissionFlags {
-    guard let url = URL(string: path) else {
+    guard let url = convertToUrl(string: path) else {
       return []
     }
     let permissionsForInternalDirectories = getInternalPathPermissions(url)

package/ios/Legacy/Services/EXReactNativeAdapter.mm

@@ -292,12 +292,7 @@ EX_REGISTER_MODULE();
 
   dispatch_async(RCTGetUIManagerQueue(), ^{
     [uiManager addUIBlock:^(RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
-#if RCT_NEW_ARCH_ENABLED
-      UIView<RCTComponentViewProtocol> *componentView = [uiManager viewForReactTag:(NSNumber *)viewId];
-      UIView *view = [(ExpoFabricViewObjC *)componentView contentView];
-#else
       UIView *view = [uiManager viewForReactTag:(NSNumber *)viewId];
-#endif
       block(view);
     }];
   });
@@ -309,12 +304,7 @@ EX_REGISTER_MODULE();
 
   dispatch_async(RCTGetUIManagerQueue(), ^{
     [uiManager addUIBlock:^(RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
-#if RCT_NEW_ARCH_ENABLED
-      UIView<RCTComponentViewProtocol> *componentView = [uiManager viewForReactTag:(NSNumber *)viewId];
-      UIView *view = [(ExpoFabricViewObjC *)componentView contentView];
-#else
       UIView *view = [uiManager viewForReactTag:(NSNumber *)viewId];
-#endif
       block(view);
     }];
     [uiManager setNeedsLayout];

package/ios/Tests/FileSystemLegacyUtilitiesSpec.swift

@@ -0,0 +1,29 @@
+// Copyright 2015-present 650 Industries. All rights reserved.
+
+import ExpoModulesTestCore
+
+@testable import ExpoModulesCore
+
+final class FileSystemLegacyUtilitiesSpec: ExpoSpec {
+  override class func spec() {
+    let fsUtils = FileSystemLegacyUtilities()
+
+    describe("getPathPermissions") {
+      it("should return read/write permissions for filePath with `file:` scheme") {
+        let dirUrl = FileManager.default.urls(for: .applicationSupportDirectory, in: .userDomainMask)[0]
+        let fileUrl = dirUrl.appendingPathComponent("dir/test.txt")
+        let filePath = fileUrl.absoluteString
+        expect(filePath.starts(with: "file:")) == true
+        expect(fsUtils.getPathPermissions(filePath)) == [.read, .write]
+      }
+
+      it("should return read/write permissions for filePath without `file:` scheme") {
+        let dirUrl = FileManager.default.urls(for: .applicationSupportDirectory, in: .userDomainMask)[0]
+        let fileUrl = dirUrl.appendingPathComponent("dir/test.txt")
+        let filePath = fileUrl.path
+        expect(filePath.starts(with: "file:")) == false
+        expect(fsUtils.getPathPermissions(filePath)) == [.read, .write]
+      }
+    }
+  }
+}

package/ios/Utilities.swift

@@ -60,11 +60,37 @@ internal func isFileUrlPath(_ path: String) -> Bool {
 }
 
 internal func convertToUrl(string value: String) -> URL? {
-  // URLComponents parses and constructs URLs according to RFC 3986.
-  // For some unusual urls URL(string:) will fail incorrectly
-  guard let url = URLComponents(string: value)?.url ?? URL(string: value) else {
+  let url: URL?
+  if #available(iOS 17, *) {
+    // URL(string:) supports RFC 3986 as URLComponents from iOS 17
+    url = URL(string: value)
+  } else if #available(iOS 16, *) {
+    // URLComponents parses and constructs URLs according to RFC 3986.
+    // For some unusual urls URL(string:) will fail incorrectly
+    url = URLComponents(string: value)?.url ?? URL(string: value)
+  } else {
+    // URLComponents on iOS 15 and lower does not well support RFC 3986.
+    // We have to fallback URL(fileURLWithPath:) first.
+    url = value.hasPrefix("/")
+      ? URL(fileURLWithPath: value)
+      : URLComponents(string: value)?.url ?? URL(string: value)
+  }
+
+  guard let url else {
     return nil
   }
   // If it has no scheme, we assume it was the file path which needs to be recreated to be recognized as the file url.
   return url.scheme != nil ? url : URL(fileURLWithPath: value)
 }
+
+/**
+ A collection of utility functions for various Expo Modules common tasks.
+ */
+public struct Utilities {
+  /**
+   Converts a `String` to a `URL`.
+   */
+  public static func urlFrom(string: String) -> URL? {
+    return convertToUrl(string: string)
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-modules-core",
-  "version": "1.12.16",
+  "version": "1.12.17",
   "description": "The core of Expo Modules architecture",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -44,5 +44,5 @@
     "@testing-library/react-hooks": "^7.0.1",
     "expo-module-scripts": "^3.0.0"
   },
-  "gitHead": "0d1a3567cb0fce9c54e1185654be88bd0c7842d4"
+  "gitHead": "09b2d97bbc0f70f7c811ff9b6c9ad8808c5ad84b"
 }