fix iOS jsi::Runtime errors

Author: JakubGonera

common/rnexecutorch/RnExecutorchInstaller.cpp

@@ -2,7 +2,6 @@
 
 #include <rnexecutorch/host_objects/JsiConversions.h>
 #include <rnexecutorch/host_objects/ModelHostObject.h>
-#include <rnexecutorch/jsi/JsiPromise.h>
 #include <rnexecutorch/models/StyleTransfer.h>
 
 namespace rnexecutorch {

common/rnexecutorch/host_objects/ModelHostObject.h

@@ -34,39 +34,45 @@ template <typename Model> class ModelHostObject : public JsiHostObject {
                 errorMessage, sizeof(errorMessage),
                 "Argument count mismatch, was expecting: %zu but got: %zu",
                 forwardArgCount, count);
-
-            promise->reject(errorMessage);
+            callInvoker->invokeAsync(
+                [errorMessage, &promise]() { promise->reject(errorMessage); });
             return;
           }
 
           // We need to dispatch a thread if we want the forward to be
           // asynchronous
-          std::thread([args, &runtime, this, promise = std::move(promise)]() {
+          std::thread([args, this, promise, &runtime]() {
             try {
               auto argsConverted = jsiconversion::createArgsTupleFromJsi(
                   &Model::forward, args, runtime);
               auto result = std::apply(std::bind_front(&Model::forward, model),
                                        argsConverted);
-
-              promise->resolve(
-                  jsiconversion::getJsiValue(std::move(result), runtime));
+              callInvoker->invokeAsync(
+                  [promise, result = std::move(result)](jsi::Runtime &runtime) {
+                    promise->resolve(
+                        jsiconversion::getJsiValue(std::move(result), runtime));
+                  });
             } catch (const std::runtime_error &e) {
               // This catch should be merged with the next two
               // (std::runtime_error and jsi::JSError inherits from
               // std::exception) HOWEVER react native has broken RTTI which
               // breaks proper exception type checking. Remove when the
               // following change is present in our version:
               // https://github.com/facebook/react-native/commit/3132cc88dd46f95898a756456bebeeb6c248f20e
-              promise->reject(e.what());
+              callInvoker->invokeAsync(
+                  [&e, promise]() { promise->reject(e.what()); });
               return;
             } catch (const jsi::JSError &e) {
-              promise->reject(e.what());
+              callInvoker->invokeAsync(
+                  [&e, promise]() { promise->reject(e.what()); });
               return;
             } catch (const std::exception &e) {
-              promise->reject(e.what());
+              callInvoker->invokeAsync(
+                  [&e, promise]() { promise->reject(e.what()); });
               return;
             } catch (...) {
-              promise->reject("Unknown error");
+              callInvoker->invokeAsync(
+                  [promise]() { promise->reject("Unknown error"); });
               return;
             }
           }).detach();

common/rnexecutorch/jsi/Promise.cpp

@@ -9,21 +9,12 @@ Promise::Promise(jsi::Runtime &runtime,
       _resolver(std::move(resolver)), _rejecter(std::move(rejecter)) {}
 
 void Promise::resolve(jsi::Value &&result) {
-  // invokeAsync takes a std::function which is copyable so we need to wrap
-  // the jsi::Value which is not.
-  auto resultPtr = std::make_shared<jsi::Value>(std::move(result));
-  callInvoker->invokeAsync([resultPtr, this]() -> void {
-    _resolver.asObject(runtime).asFunction(runtime).call(runtime,
-                                                         std::move(*resultPtr));
-  });
+  _resolver.asObject(runtime).asFunction(runtime).call(runtime, result);
 }
 
 void Promise::reject(std::string message) {
-  callInvoker->invokeAsync([message = std::move(message), this]() -> void {
-    jsi::JSError error(runtime, message);
-    _rejecter.asObject(runtime).asFunction(runtime).call(runtime,
-                                                         error.value());
-  });
+  jsi::JSError error(runtime, message);
+  _rejecter.asObject(runtime).asFunction(runtime).call(runtime, error.value());
 }
 
 } // namespace rnexecutorch