Refactor: ReactInstance: Pull "fatal error" bool into JsErrorHandler

Summary:
I think we should try to centralize all things js error handling related inside JsErrorHandler. So, I moved this bool into JsErrorHandler.

This makes ReactInstance easier to understand: it removes one member variable from ReactInstance.

Changelog: [Internal]

Reviewed By: cipolleschi

Differential Revision: D55547897

Author: RSNara

packages/react-native/ReactCommon/jserrorhandler/JsErrorHandler.cpp

@@ -90,7 +90,8 @@ parseErrorStack(const jsi::JSError& error, bool isFatal, bool isHermes) {
 
 JsErrorHandler::JsErrorHandler(
     JsErrorHandler::JsErrorHandlingFunc jsErrorHandlingFunc)
-    : _jsErrorHandlingFunc(std::move(jsErrorHandlingFunc)){
+    : _jsErrorHandlingFunc(std::move(jsErrorHandlingFunc)),
+      _hasHandledFatalError(false){
 
       };
 
@@ -99,8 +100,15 @@ JsErrorHandler::~JsErrorHandler() {}
 void JsErrorHandler::handleJsError(const jsi::JSError& error, bool isFatal) {
   // TODO: Current error parsing works and is stable. Can investigate using
   // REGEX_HERMES to get additional Hermes data, though it requires JS setup.
+  if (isFatal) {
+    _hasHandledFatalError = true;
+  }
   ParsedError parsedError = parseErrorStack(error, isFatal, false);
   _jsErrorHandlingFunc(parsedError);
 }
 
+bool JsErrorHandler::hasHandledFatalError() {
+  return _hasHandledFatalError;
+}
+
 } // namespace facebook::react

packages/react-native/ReactCommon/jserrorhandler/JsErrorHandler.h

@@ -33,9 +33,11 @@ class JsErrorHandler {
   ~JsErrorHandler();
 
   void handleJsError(const jsi::JSError& error, bool isFatal);
+  bool hasHandledFatalError();
 
  private:
   JsErrorHandlingFunc _jsErrorHandlingFunc;
+  bool _hasHandledFatalError;
 };
 
 } // namespace facebook::react

packages/react-native/ReactCommon/react/runtime/ReactInstance.cpp

@@ -38,24 +38,23 @@ ReactInstance::ReactInstance(
       timerManager_(std::move(timerManager)),
       jsErrorHandler_(
           std::make_shared<JsErrorHandler>(std::move(jsErrorHandlingFunc))),
-      hasFatalJsError_(std::make_shared<bool>(false)),
       parentInspectorTarget_(parentInspectorTarget) {
   RuntimeExecutor runtimeExecutor = [weakRuntime = std::weak_ptr(runtime_),
                                      weakTimerManager =
                                          std::weak_ptr(timerManager_),
                                      weakJsMessageQueueThread =
                                          std::weak_ptr(jsMessageQueueThread_),
-                                     weakHasFatalJsError = std::weak_ptr(
-                                         hasFatalJsError_)](auto callback) {
-    if (std::shared_ptr<bool> sharedHasFatalJsError =
-            weakHasFatalJsError.lock()) {
-      if (*sharedHasFatalJsError) {
-        LOG(INFO)
-            << "Calling into JS using runtimeExecutor but hasFatalJsError_ is true";
-        return;
-      }
+                                     weakJsErrorHander = std::weak_ptr(
+                                         jsErrorHandler_)](auto callback) {
+    auto jsErrorHandler = weakJsErrorHander.lock();
+    if (weakRuntime.expired() || !jsErrorHandler) {
+      return;
     }
-    if (weakRuntime.expired()) {
+
+    if (jsErrorHandler->hasHandledFatalError()) {
+      LOG(INFO)
+          << "RuntimeExecutor: Detected fatal js error. Dropping work on non-js thread."
+          << std::endl;
       return;
     }
 
@@ -223,8 +222,6 @@ void ReactInstance::loadScript(
             strongBufferedRuntimeExecuter->flush();
           }
         } catch (jsi::JSError& error) {
-          // Handle uncaught JS errors during loading JS bundle
-          *hasFatalJsError_ = true;
           jsErrorHandler_->handleJsError(error, true);
         }
       });

packages/react-native/ReactCommon/react/runtime/ReactInstance.h

@@ -82,9 +82,6 @@ class ReactInstance final : private jsinspector_modern::InstanceTargetDelegate {
   std::shared_ptr<RuntimeScheduler> runtimeScheduler_;
   std::shared_ptr<JsErrorHandler> jsErrorHandler_;
 
-  // Whether there are errors caught during bundle loading
-  std::shared_ptr<bool> hasFatalJsError_;
-
   jsinspector_modern::InstanceTarget* inspectorTarget_{nullptr};
   jsinspector_modern::RuntimeTarget* runtimeInspectorTarget_{nullptr};
   jsinspector_modern::HostTarget* parentInspectorTarget_{nullptr};