expo-modules-core 3.0.11 → 3.0.12

package/CHANGELOG.md

@@ -10,11 +10,18 @@
 
 ### 💡 Others
 
+## 3.0.12 — 2025-09-03
+
+### 💡 Others
+
+- Use new LongLivedObject.h and CallbackWrapper.h headers namespace ([#39344](https://github.com/expo/expo/pull/39344) by [@gabrieldonadel](https://github.com/gabrieldonadel))
+
 ## 3.0.11 — 2025-09-02
 
 ### 🎉 New features
 
 - Add `disableForceFlatten` prop to control flattening of display contents views. ([#39262](https://github.com/expo/expo/pull/39262) by [@nishan](https://github.com/intergalacticspacehighway))
+- Add logging from native to JS, compliant with the Logger interface, via `appContext.jsLogger`. ([#39159](https://github.com/expo/expo/pull/39159) by [@behenate](https://github.com/behenate))
 
 ### 🐛 Bug fixes
 

package/android/build.gradle

@@ -25,7 +25,7 @@ if (shouldIncludeCompose) {
 }
 
 group = 'host.exp.exponent'
-version = '3.0.11'
+version = '3.0.12'
 
 def isExpoModulesCoreTests = {
   Gradle gradle = getGradle()
@@ -75,7 +75,7 @@ android {
   defaultConfig {
     consumerProguardFiles 'proguard-rules.pro'
     versionCode 1
-    versionName "3.0.11"
+    versionName "3.0.12"
     buildConfigField "String", "EXPO_MODULES_CORE_VERSION", "\"${versionName}\""
     buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled.toString()
 

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

@@ -14,7 +14,7 @@
 #include <react/jni/WritableNativeMap.h>
 #include <fbjni/detail/CoreClasses.h>
 #include <ReactCommon/CallInvoker.h>
-#include <ReactCommon/LongLivedObject.h>
+#include <react/bridging/LongLivedObject.h>
 
 namespace jni = facebook::jni;
 namespace react = facebook::react;

package/android/src/main/cpp/MethodMetadata.cpp

@@ -14,7 +14,7 @@
 #include <unistd.h>
 #include <optional>
 
-#include <ReactCommon/LongLivedObject.h>
+#include <react/bridging/LongLivedObject.h>
 
 namespace jni = facebook::jni;
 namespace jsi = facebook::jsi;

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

@@ -29,6 +29,7 @@ import expo.modules.kotlin.activityresult.DefaultAppContextActivityResultCaller
 import expo.modules.kotlin.defaultmodules.AppDirectoriesModule
 import expo.modules.kotlin.defaultmodules.ErrorManagerModule
 import expo.modules.kotlin.defaultmodules.FilePermissionModule
+import expo.modules.kotlin.defaultmodules.JSLoggerModule
 import expo.modules.kotlin.defaultmodules.NativeModulesProxyModule
 import expo.modules.kotlin.events.EventEmitter
 import expo.modules.kotlin.events.EventName
@@ -109,8 +110,8 @@ class AppContext(
       // Registering modules has to happen at the very end of `AppContext` creation. Some modules need to access
       // `AppContext` during their initialisation, so we need to ensure all `AppContext`'s
       // properties are initialized first. Not having that would trigger NPE.
-      registry.register(ErrorManagerModule())
       registry.register(NativeModulesProxyModule())
+      registry.register(JSLoggerModule())
 
       // Registering modules that were previously provided by legacy FileSystem module.
       legacyModuleRegistry.registerInternalModule(FilePermissionModule())
@@ -248,8 +249,14 @@ class AppContext(
       return KEventEmitterWrapper(legacyEventEmitter, hostingRuntimeContext.reactContextHolder)
     }
 
-  val errorManager: ErrorManagerModule?
-    get() = hostingRuntimeContext.registry.getModule()
+  @Deprecated("Use AppContext.jsLogger instead")
+  val errorManager: ErrorManagerModule? by lazy {
+    hostingRuntimeContext.registry.getModule()
+  }
+
+  val jsLogger by lazy {
+    hostingRuntimeContext.registry.getModule<JSLoggerModule>()?.logger
+  }
 
   internal fun onDestroy() = trace("AppContext.onDestroy") {
     hostingRuntimeContext.reactContext?.removeLifecycleEventListener(reactLifecycleDelegate)

package/android/src/main/java/expo/modules/kotlin/defaultmodules/JSLoggerModule.kt

@@ -0,0 +1,92 @@
+package expo.modules.kotlin.defaultmodules
+
+import android.os.Bundle
+import expo.modules.core.logging.LogHandler
+import expo.modules.core.logging.LogType
+import expo.modules.core.logging.Logger
+import expo.modules.kotlin.exception.CodedException
+import expo.modules.kotlin.modules.Module
+import expo.modules.kotlin.modules.ModuleDefinition
+import java.lang.ref.WeakReference
+
+private const val moduleName = "ExpoModulesCoreJSLogger"
+private const val onNewError = "$moduleName.onNewError"
+private const val onNewWarning = "$moduleName.onNewWarning"
+private const val onNewDebug = "$moduleName.onNewDebug"
+private const val onNewInfo = "$moduleName.onNewInfo"
+private const val onNewTrace = "$moduleName.onNewTrace"
+
+@Deprecated("Use JSLoggerModule instead")
+typealias ErrorManagerModule = JSLoggerModule
+
+class JSLoggerModule : Module() {
+  private class JSLogHandler(module: JSLoggerModule) : LogHandler() {
+    private val moduleReference = WeakReference(module)
+
+    override fun log(type: LogType, message: String, cause: Throwable?) {
+      val finalMessage = if (cause != null) {
+        "$message. ${cause.message}"
+      } else {
+        message
+      }
+      moduleReference.get()?.reportToLogBox(type, finalMessage)
+    }
+  }
+
+  var logger: Logger? = null
+    private set
+
+  override fun definition() = ModuleDefinition {
+    Name(moduleName)
+
+    Events(onNewError, onNewWarning, onNewDebug, onNewInfo, onNewTrace)
+
+    OnCreate {
+      val logHandler = JSLogHandler(this@JSLoggerModule)
+      logger = Logger(listOf(logHandler))
+    }
+  }
+
+  @Deprecated("Use appContext.jsLogger.warn(...) instead")
+  fun reportWarningToLogBox(warning: String) {
+    sendEvent(
+      onNewWarning,
+      createMessageBundle(warning)
+    )
+  }
+
+  @Deprecated("Use appContext.jsLogger.error(...) instead")
+  fun reportExceptionToLogBox(codedException: CodedException) {
+    sendEvent(
+      onNewError,
+      createMessageBundle(codedException.message ?: codedException.toString())
+    )
+  }
+
+  private fun createMessageBundle(message: String): Bundle {
+    return Bundle().apply {
+      putString("message", message)
+    }
+  }
+
+  private fun reportToLogBox(type: LogType, message: String) {
+    sendEvent(
+      type.eventName,
+      Bundle().apply {
+        putString("message", message)
+      }
+    )
+  }
+}
+
+private val LogType.eventName: String
+  get() = when (this) {
+    LogType.Trace -> onNewTrace
+    LogType.Timer -> onNewDebug
+    LogType.Stacktrace -> onNewTrace
+    LogType.Debug -> onNewDebug
+    LogType.Info -> onNewInfo
+    LogType.Warn -> onNewWarning
+    LogType.Error -> onNewError
+    LogType.Fatal -> onNewError
+  }

package/build/index.d.ts

@@ -1,4 +1,4 @@
-import './sweet/setUpErrorManager.fx';
+import './sweet/setUpJsLogger.fx';
 import './polyfill';
 export type * from './ts-declarations/global';
 export { EventEmitter, type EventSubscription } from './EventEmitter';

package/build/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,8BAA8B,CAAC;AACtC,OAAO,YAAY,CAAC;AAEpB,mBAAmB,0BAA0B,CAAC;AAE9C,OAAO,EAAE,YAAY,EAAE,KAAK,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AACtE,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,OAAO,EAAE,OAAO,IAAI,QAAQ,EAAE,MAAM,YAAY,CAAC;AACjD,OAAO,EAAE,OAAO,IAAI,IAAI,EAAE,MAAM,QAAQ,CAAC;AAEzC,YAAY,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AACpE,OAAO,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAC;AAEtE,cAAc,uBAAuB,CAAC;AACtC,cAAc,qBAAqB,CAAC;AACpC,cAAc,qBAAqB,CAAC;AAEpC,cAAc,wBAAwB,CAAC;AACvC,cAAc,mBAAmB,CAAC;AAElC,cAAc,QAAQ,CAAC;AAEvB,cAAc,kCAAkC,CAAC;AACjD,cAAc,UAAU,CAAC;AAGzB,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AAGnE,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,OAAO,IAAI,kBAAkB,EAAE,MAAM,sBAAsB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,0BAA0B,CAAC;AAClC,OAAO,YAAY,CAAC;AAEpB,mBAAmB,0BAA0B,CAAC;AAE9C,OAAO,EAAE,YAAY,EAAE,KAAK,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AACtE,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,OAAO,EAAE,OAAO,IAAI,QAAQ,EAAE,MAAM,YAAY,CAAC;AACjD,OAAO,EAAE,OAAO,IAAI,IAAI,EAAE,MAAM,QAAQ,CAAC;AAEzC,YAAY,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AACpE,OAAO,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAC;AAEtE,cAAc,uBAAuB,CAAC;AACtC,cAAc,qBAAqB,CAAC;AACpC,cAAc,qBAAqB,CAAC;AAEpC,cAAc,wBAAwB,CAAC;AACvC,cAAc,mBAAmB,CAAC;AAElC,cAAc,QAAQ,CAAC;AAEvB,cAAc,kCAAkC,CAAC;AACjD,cAAc,UAAU,CAAC;AAGzB,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AAGnE,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,OAAO,IAAI,kBAAkB,EAAE,MAAM,sBAAsB,CAAC"}

package/build/sweet/{NativeErrorManager.d.ts → NativeJSLogger.d.ts}

@@ -1,3 +1,3 @@
 declare const _default: any;
 export default _default;
-//# sourceMappingURL=NativeErrorManager.d.ts.map
+//# sourceMappingURL=NativeJSLogger.d.ts.map

package/build/sweet/NativeJSLogger.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"NativeJSLogger.d.ts","sourceRoot":"","sources":["../../src/sweet/NativeJSLogger.ts"],"names":[],"mappings":";AAEA,wBAAsE"}

package/build/sweet/setUpJsLogger.fx.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=setUpJsLogger.fx.d.ts.map

package/build/sweet/setUpJsLogger.fx.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"setUpJsLogger.fx.d.ts","sourceRoot":"","sources":["../../src/sweet/setUpJsLogger.fx.ts"],"names":[],"mappings":""}

package/build/sweet/setUpJsLogger.fx.web.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=setUpJsLogger.fx.web.d.ts.map

package/build/sweet/setUpJsLogger.fx.web.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"setUpJsLogger.fx.web.d.ts","sourceRoot":"","sources":["../../src/sweet/setUpJsLogger.fx.web.ts"],"names":[],"mappings":""}

package/ios/Core/AppContext.swift

@@ -17,6 +17,15 @@ public final class AppContext: NSObject {
    */
   public let config: AppContextConfig
 
+  public lazy var jsLogger: Logger = {
+    let loggerModule = self.moduleRegistry.get(moduleWithName: JSLoggerModule.name) as? JSLoggerModule
+    guard let logger = loggerModule?.logger else {
+      log.error("Failed to get the JSLoggerModule logger. Falling back to OS logger.")
+      return log
+    }
+    return logger
+  }()
+
   /**
    The module registry for the app context.
    */
@@ -126,6 +135,8 @@ public final class AppContext: NSObject {
     self.config = config ?? AppContextConfig(documentDirectory: nil, cacheDirectory: nil, appGroups: appCodeSignEntitlements.appGroups)
 
     super.init()
+
+    self.moduleRegistry.register(module: JSLoggerModule(appContext: self))
     listenToClientAppNotifications()
   }
 

package/ios/Core/Modules/JSLoggerModule.swift

@@ -0,0 +1,65 @@
+private let onNewError = "\(JSLoggerModule.name).onNewError"
+private let onNewWarning = "\(JSLoggerModule.name).onNewWarning"
+private let onNewDebug = "\(JSLoggerModule.name).onNewDebug"
+private let onNewInfo = "\(JSLoggerModule.name).onNewInfo"
+private let onNewTrace = "\(JSLoggerModule.name).onNewTrace"
+
+public final class JSLoggerModule: Module {
+  public static let name = "ExpoModulesCoreJSLogger"
+
+  // We could have made the JSLoggerModule implement the LogHandler interface, but the Logger
+  // holds a strong reference to the LogHandlers, which would lead to a reference cycle.
+  private class JSLogHandler: LogHandler {
+    weak var module: JSLoggerModule?
+
+    init(module: JSLoggerModule) {
+      self.module = module
+    }
+
+    func log(type: LogType, _ message: String) {
+      module?.reportToLogBox(type: type, message)
+    }
+  }
+
+  public var logger: Logger?
+
+  public func definition() -> ModuleDefinition {
+    Name(Self.name)
+
+    Events(onNewError, onNewWarning, onNewDebug, onNewInfo, onNewTrace)
+
+    OnCreate {
+      let logHandler = JSLogHandler(module: self)
+      self.logger = Logger(logHandlers: [logHandler])
+    }
+  }
+
+  private func reportToLogBox(type: LogType, _ message: String) {
+    self.sendEvent(type.eventName, [
+      "message": message
+    ])
+  }
+}
+
+private extension LogType {
+  var eventName: String {
+    switch self {
+    case .trace:
+      onNewTrace
+    case .timer:
+      onNewDebug
+    case .stacktrace:
+      onNewTrace
+    case .debug:
+      onNewDebug
+    case .info:
+      onNewInfo
+    case .warn:
+      onNewWarning
+    case .error:
+      onNewError
+    case .fatal:
+      onNewError
+    }
+  }
+}

package/ios/JSI/EXJSIConversions.mm

@@ -1,6 +1,6 @@
 // Copyright 2018-present 650 Industries. All rights reserved.
 
-#import <ReactCommon/CallbackWrapper.h>
+#import <react/bridging/CallbackWrapper.h>
 #import <ExpoModulesCore/EXJavaScriptValue.h>
 #import <ExpoModulesCore/EXJavaScriptObject.h>
 #import <ExpoModulesCore/EXJavaScriptWeakObject.h>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-modules-core",
-  "version": "3.0.11",
+  "version": "3.0.12",
   "description": "The core of Expo Modules architecture",
   "main": "src/index.ts",
   "types": "build/index.d.ts",
@@ -65,5 +65,5 @@
     "@testing-library/react-native": "^13.2.0",
     "expo-module-scripts": "^5.0.6"
   },
-  "gitHead": "d635404a12ea7996b987ce0fb7679a238ebcf31b"
+  "gitHead": "f97e6d1cae0cb14d5eed1b08fad6d12a7144af3a"
 }

package/src/index.ts

@@ -1,4 +1,4 @@
-import './sweet/setUpErrorManager.fx';
+import './sweet/setUpJsLogger.fx';
 import './polyfill';
 
 export type * from './ts-declarations/global';

package/src/sweet/NativeJSLogger.ts

@@ -0,0 +1,3 @@
+import { requireOptionalNativeModule } from '../requireNativeModule';
+
+export default requireOptionalNativeModule('ExpoModulesCoreJSLogger');

package/src/sweet/setUpJsLogger.fx.ts

@@ -0,0 +1,56 @@
+import NativeJSLogger from './NativeJSLogger';
+import Platform from '../Platform';
+import { CodedError } from '../errors/CodedError';
+
+type LogListener = {
+  action: (...data: any[]) => void;
+  eventName: string;
+};
+
+if (__DEV__ && (Platform.OS === 'android' || Platform.OS === 'ios') && NativeJSLogger) {
+  const onNewException: LogListener = {
+    eventName: 'ExpoModulesCoreJSLogger.onNewError',
+    action: console.error,
+  };
+
+  const onNewWarning: LogListener = {
+    eventName: 'ExpoModulesCoreJSLogger.onNewWarning',
+    action: console.warn,
+  };
+
+  const onNewDebug: LogListener = {
+    eventName: 'ExpoModulesCoreJSLogger.onNewDebug',
+    action: console.debug,
+  };
+
+  const onNewInfo: LogListener = {
+    eventName: 'ExpoModulesCoreJSLogger.onNewInfo',
+    action: console.info,
+  };
+
+  const onNewTrace: LogListener = {
+    eventName: 'ExpoModulesCoreJSLogger.onNewTrace',
+    action: console.trace,
+  };
+
+  const listeners: LogListener[] = [
+    onNewException,
+    onNewWarning,
+    onNewDebug,
+    onNewInfo,
+    onNewTrace,
+  ];
+
+  for (const listener of listeners) {
+    NativeJSLogger.addListener(listener.eventName, ({ message }: { message: string }) => {
+      listener.action(message);
+    });
+  }
+}
+
+declare namespace globalThis {
+  let ExpoModulesCore_CodedError: undefined | typeof CodedError;
+}
+
+// We have to export `CodedError` via global object to use in later in the C++ code.
+globalThis.ExpoModulesCore_CodedError = CodedError;

package/android/src/main/java/expo/modules/kotlin/defaultmodules/ErrorManagerModule.kt

@@ -1,34 +0,0 @@
-package expo.modules.kotlin.defaultmodules
-
-import android.os.Bundle
-import expo.modules.kotlin.exception.CodedException
-import expo.modules.kotlin.modules.Module
-import expo.modules.kotlin.modules.ModuleDefinition
-
-private const val onNewException = "ExpoModulesCoreErrorManager.onNewException"
-private const val onNewWarning = "ExpoModulesCoreErrorManager.onNewWarning"
-
-class ErrorManagerModule : Module() {
-  override fun definition() = ModuleDefinition {
-    Name("ExpoModulesCoreErrorManager")
-    Events(onNewException, onNewWarning)
-  }
-
-  fun reportExceptionToLogBox(codedException: CodedException) {
-    sendEvent(
-      onNewException,
-      Bundle().apply {
-        putString("message", codedException.message ?: codedException.toString())
-      }
-    )
-  }
-
-  fun reportWarningToLogBox(warning: String) {
-    sendEvent(
-      onNewWarning,
-      Bundle().apply {
-        putString("message", warning)
-      }
-    )
-  }
-}

package/build/sweet/NativeErrorManager.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"NativeErrorManager.d.ts","sourceRoot":"","sources":["../../src/sweet/NativeErrorManager.ts"],"names":[],"mappings":";AAEA,wBAA0E"}

package/build/sweet/setUpErrorManager.fx.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=setUpErrorManager.fx.d.ts.map

package/build/sweet/setUpErrorManager.fx.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"setUpErrorManager.fx.d.ts","sourceRoot":"","sources":["../../src/sweet/setUpErrorManager.fx.ts"],"names":[],"mappings":""}

package/build/sweet/setUpErrorManager.fx.web.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=setUpErrorManager.fx.web.d.ts.map

package/build/sweet/setUpErrorManager.fx.web.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"setUpErrorManager.fx.web.d.ts","sourceRoot":"","sources":["../../src/sweet/setUpErrorManager.fx.web.ts"],"names":[],"mappings":""}

package/src/sweet/NativeErrorManager.ts

@@ -1,3 +0,0 @@
-import { requireOptionalNativeModule } from '../requireNativeModule';
-
-export default requireOptionalNativeModule('ExpoModulesCoreErrorManager');

package/src/sweet/setUpErrorManager.fx.ts

@@ -1,23 +0,0 @@
-import NativeErrorManager from './NativeErrorManager';
-import Platform from '../Platform';
-import { CodedError } from '../errors/CodedError';
-
-if (__DEV__ && Platform.OS === 'android' && NativeErrorManager) {
-  const onNewException = 'ExpoModulesCoreErrorManager.onNewException';
-  const onNewWarning = 'ExpoModulesCoreErrorManager.onNewWarning';
-
-  NativeErrorManager.addListener(onNewException, ({ message }: { message: string }) => {
-    console.error(message);
-  });
-
-  NativeErrorManager.addListener(onNewWarning, ({ message }: { message: string }) => {
-    console.warn(message);
-  });
-}
-
-declare namespace globalThis {
-  let ExpoModulesCore_CodedError: undefined | typeof CodedError;
-}
-
-// We have to export `CodedError` via global object to use in later in the C++ code.
-globalThis.ExpoModulesCore_CodedError = CodedError;