POC: Mixed stack traces for Android and iOS Turbo Modules

packages/react-native/ReactCommon/jsc/JSCRuntime.cpp

@@ -1240,6 +1240,11 @@ jsi::Function JSCRuntime::createFunctionFromHostFunction(
         exceptionString += ex.what();
         *exception = makeError(rt, exceptionString);
         res = JSValueMakeUndefined(ctx);
+      } catch (const std::string &ex) {
+        std::string exceptionString("Exception in HostFunction: ");
+        exceptionString += ex;
+        *exception = makeError(rt, exceptionString);
+        res = JSValueMakeUndefined(ctx);
       } catch (...) {
         std::string exceptionString("Exception in HostFunction: <unknown>");
         *exception = makeError(rt, exceptionString);

packages/react-native/ReactCommon/react/nativemodule/core/platform/android/ReactCommon/JavaTurboModule.cpp

@@ -468,7 +468,39 @@ jsi::Value JavaTurboModule::invokeJavaMethod(
       } else {
         TMPL::asyncMethodCallFail(moduleName, methodName);
       }
-      throw;
+      auto exception = std::current_exception();
+      auto throwable = facebook::jni::getJavaExceptionForCppException(exception);
+      auto stackTrace = throwable->getStackTrace();
+
+      jsi::Array stackArray(runtime, stackTrace->size());
+      std::string stackTraceStr;
+      for (int i = 0; i < stackTrace->size(); ++i) {
+        auto frame = stackTrace->getElement(i);
+        stackTraceStr += frame->toString() + '\n';
+
+        jsi::Object frameObject(runtime);
+        frameObject.setProperty(runtime, "className", frame->getClassName());
+        frameObject.setProperty(runtime, "fileName", frame->getFileName());
+        frameObject.setProperty(runtime, "lineNumber", frame->getLineNumber());
+        frameObject.setProperty(runtime, "methodName", frame->getMethodName());
+        stackArray.setValueAtIndex(runtime, i, std::move(frameObject));
+      }
+
+      // TODO Better would be use getMessage() but its missing in fbjni interface
+      auto throwableString = throwable->toString();
+      std::string name = throwableString.substr(0, throwableString.find(':'));
+      std::string message = throwableString.substr(throwableString.find(':') + 2, -1);
+      jsi::Object cause(runtime);
+      cause.setProperty(runtime, "name", name);
+      cause.setProperty(runtime, "message", message);
+      cause.setProperty(runtime, "stack", stackTraceStr);
+      cause.setProperty(runtime, "stackArray", std::move(stackArray));
+
+      jsi::Value error =
+        runtime.global().getPropertyAsFunction(runtime, "Error")
+          .call(runtime, "Exception in HostFunction: " + message);
+      error.asObject(runtime).setProperty(runtime, "cause", cause);
+      throw jsi::JSError(runtime, std::move(error));
     }
   };
 

packages/react-native/ReactCommon/react/nativemodule/core/platform/ios/ReactCommon/RCTTurboModule.mm

@@ -211,6 +211,16 @@ static int32_t getUniqueId()
   return [callback copy];
 }
 
+static NSString *convertNSExceptionStackToString(NSException *exception)
+{
+  NSMutableString *stack = [[NSMutableString alloc] init];
+  for (NSString* symbol in exception.callStackSymbols) {
+    [stack appendFormat:@"%@\n", symbol];
+  }
+
+  return stack;
+}
+
 namespace facebook {
 namespace react {
 
@@ -378,8 +388,23 @@ static int32_t getUniqueId()
     }
 
     // TODO(T66699874) Should we guard this with a try/catch?
-    [inv invokeWithTarget:strongModule];
-    [retainedObjectsForInvocation removeAllObjects];
+    @try {
+      [inv invokeWithTarget:strongModule];
+    } @catch (NSException *exception) {
+      std::string reason = std::string([exception.reason UTF8String]);
+      jsi::Object cause(runtime);
+      cause.setProperty(runtime, "name", std::string([exception.name UTF8String]));
+      cause.setProperty(runtime, "message", reason);
+      cause.setProperty(runtime, "stack", std::string([convertNSExceptionStackToString(exception) UTF8String]));
+      //TODO For release builds better would be use include callStackReturnAddresses
+      jsi::Value error =
+        runtime.global().getPropertyAsFunction(runtime, "Error")
+          .call(runtime, "Exception in HostFunction: " + reason);
+      error.asObject(runtime).setProperty(runtime, "cause", cause);
+      throw jsi::JSError(runtime, std::move(error));
+    } @finally {
+      [retainedObjectsForInvocation removeAllObjects];
+    }
 
     if (!wasMethodSync) {
       TurboModulePerfLogger::asyncMethodCallExecutionEnd(moduleName, methodNameStr.c_str(), asyncCallCounter);