fix: Add workaround for error messages on Android (#408)

mrousavy · Dec 9, 2024 · 27e8cbb · 27e8cbb
1 parent 3ccafbc
commit 27e8cbb
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/packages/react-native-nitro-modules/cpp/core/HybridFunction.hpp b/packages/react-native-nitro-modules/cpp/core/HybridFunction.hpp
@@ -108,6 +108,14 @@ class HybridFunction final {
         std::string funcName = getHybridFuncFullName<THybrid>(kind, name, hybridInstance.get());
         std::string message = exception.what();
         throw jsi::JSError(runtime, funcName + ": " + message);
+#ifdef ANDROID
+        // Workaround for https://github.com/mrousavy/nitro/issues/382
+      } catch (const std::runtime_error& exception) {
+        // Some exception was thrown - add method name information and re-throw as `JSError`.
+        std::string funcName = getHybridFuncFullName<THybrid>(kind, name, hybridInstance.get());
+        std::string message = exception.what();
+        throw jsi::JSError(runtime, funcName + ": " + message);
+#endif
       } catch (...) {
         // Some unknown exception was thrown - add method name information and re-throw as `JSError`.
         std::string funcName = getHybridFuncFullName<THybrid>(kind, name, hybridInstance.get());

diff --git a/packages/react-native-nitro-modules/cpp/jsi/JSIConverter+Exception.hpp b/packages/react-native-nitro-modules/cpp/jsi/JSIConverter+Exception.hpp
@@ -39,6 +39,12 @@ struct JSIConverter<std::exception_ptr> final {
     } catch (const std::exception& e) {
       jsi::JSError error(runtime, e.what());
       return jsi::Value(runtime, error.value());
+#ifdef ANDROID
+      // Workaround for https://github.com/mrousavy/nitro/issues/382
+    } catch (const std::exception& e) {
+      jsi::JSError error(runtime, e.what());
+      return jsi::Value(runtime, error.value());
+#endif
     } catch (...) {
       // Some unknown exception was thrown - maybe an Objective-C error?
       std::string errorName = TypeInfo::getCurrentExceptionName();