Skip to content

fix: make native error of type Error instead of Object #1165

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chmjkb merged 1 commit into from
May 21, 2026
Merged

fix: make native error of type Error instead of Object #1165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 5 additions & 8 deletions packages/react-native-executorch/common/rnexecutorch/RnExecutorchInstaller.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,14 +93,11 @@ class RnExecutorchInstaller {
} catch (const rnexecutorch::RnExecutorchError &e) {
auto code = e.getNumericCode();
auto msg = std::string(e.what());
jsCallInvoker->invokeAsync([promise, code,
msg](jsi::Runtime &rt) {
jsi::Object errorData(rt);
errorData.setProperty(rt, "code", code);
errorData.setProperty(
rt, "message", jsi::String::createFromUtf8(rt, msg));
promise->reject(jsi::Value(rt, std::move(errorData)));
});
jsCallInvoker->invokeAsync(
[promise, code, msg](jsi::Runtime &rt) {
promise->reject(
makeRnExecutorchErrorValue(rt, code, msg));
});
} catch (const std::exception &e) {
jsCallInvoker->invokeAsync(
[promise, msg = std::string(e.what())]() {
Expand Down
135 changes: 67 additions & 68 deletions packages/react-native-executorch/common/rnexecutorch/host_objects/ModelHostObject.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,19 @@

namespace rnexecutorch {

inline jsi::Value makeRnExecutorchErrorValue(jsi::Runtime &runtime,
int32_t code,
const std::string &message) {
auto errorObj =
runtime.global()
.getPropertyAsFunction(runtime, "Error")
.callAsConstructor(runtime,
jsi::String::createFromUtf8(runtime, message))
.asObject(runtime);
errorObj.setProperty(runtime, "code", code);
return jsi::Value(std::move(errorObj));
}

template <typename Model> class ModelHostObject : public JsiHostObject {
public:
explicit ModelHostObject(const std::shared_ptr<Model> &model,
Expand Down Expand Up @@ -252,11 +265,8 @@ template <typename Model> class ModelHostObject : public JsiHostObject {
return jsi_conversion::getJsiValue(std::move(result), runtime);
}
} catch (const RnExecutorchError &e) {
jsi::Object errorData(runtime);
errorData.setProperty(runtime, "code", e.getNumericCode());
errorData.setProperty(runtime, "message",
jsi::String::createFromUtf8(runtime, e.what()));
throw jsi::JSError(runtime, jsi::Value(runtime, std::move(errorData)));
throw jsi::JSError(runtime, makeRnExecutorchErrorValue(
runtime, e.getNumericCode(), e.what()));
} catch (const std::exception &e) {
throw jsi::JSError(runtime, e.what());
} catch (...) {
Expand Down Expand Up @@ -322,11 +332,8 @@ template <typename Model> class ModelHostObject : public JsiHostObject {
return jsi_conversion::getJsiValue(std::move(result), runtime);
}
} catch (const RnExecutorchError &e) {
jsi::Object errorData(runtime);
errorData.setProperty(runtime, "code", e.getNumericCode());
errorData.setProperty(runtime, "message",
jsi::String::createFromUtf8(runtime, e.what()));
throw jsi::JSError(runtime, jsi::Value(runtime, std::move(errorData)));
throw jsi::JSError(runtime, makeRnExecutorchErrorValue(
runtime, e.getNumericCode(), e.what()));
} catch (const std::exception &e) {
throw jsi::JSError(runtime, e.what());
} catch (...) {
Expand Down Expand Up @@ -359,60 +366,55 @@ template <typename Model> class ModelHostObject : public JsiHostObject {
// We need to dispatch a thread if we want the function to be
// asynchronous. In this thread all accesses to jsi::Runtime need to
// be done via the callInvoker.
threads::GlobalThreadPool::detach([model = this->model,
callInvoker = this->callInvoker,
promise,
argsConverted =
std::move(argsConverted)]() {
try {
if constexpr (std::is_void_v<decltype(std::apply(
std::bind_front(FnPtr, model),
argsConverted))>) {
// For void functions, just call the function and resolve
// with undefined
std::apply(std::bind_front(FnPtr, model),
std::move(argsConverted));
callInvoker->invokeAsync([promise](jsi::Runtime &runtime) {
promise->resolve(jsi::Value::undefined());
});
} else {
// For non-void functions, capture the result and convert
// it
auto result = std::apply(std::bind_front(FnPtr, model),
std::move(argsConverted));
// The result is copied. It should either be quickly
// copiable, or passed with a shared_ptr.
callInvoker->invokeAsync(
[promise, result](jsi::Runtime &runtime) {
promise->resolve(jsi_conversion::getJsiValue(
std::move(result), runtime));
});
}
} catch (const RnExecutorchError &e) {
auto code = e.getNumericCode();
auto msg = std::string(e.what());
callInvoker->invokeAsync([code, msg,
promise](jsi::Runtime &runtime) {
jsi::Object errorData(runtime);
errorData.setProperty(runtime, "code", code);
errorData.setProperty(
runtime, "message",
jsi::String::createFromUtf8(runtime, msg));
promise->reject(jsi::Value(runtime, std::move(errorData)));
});
return;
} catch (const std::exception &e) {
callInvoker->invokeAsync([e = std::move(e), promise]() {
promise->reject(std::string(e.what()));
});
return;
} catch (...) {
callInvoker->invokeAsync([promise]() {
promise->reject(std::string("Unknown error"));
threads::GlobalThreadPool::detach(
[model = this->model, callInvoker = this->callInvoker, promise,
argsConverted = std::move(argsConverted)]() {
try {
if constexpr (std::is_void_v<decltype(std::apply(
std::bind_front(FnPtr, model),
argsConverted))>) {
// For void functions, just call the function and resolve
// with undefined
std::apply(std::bind_front(FnPtr, model),
std::move(argsConverted));
callInvoker->invokeAsync(
[promise](jsi::Runtime &runtime) {
promise->resolve(jsi::Value::undefined());
});
} else {
// For non-void functions, capture the result and convert
// it
auto result = std::apply(std::bind_front(FnPtr, model),
std::move(argsConverted));
// The result is copied. It should either be quickly
// copiable, or passed with a shared_ptr.
callInvoker->invokeAsync(
[promise, result](jsi::Runtime &runtime) {
promise->resolve(jsi_conversion::getJsiValue(
std::move(result), runtime));
});
}
} catch (const RnExecutorchError &e) {
auto code = e.getNumericCode();
auto msg = std::string(e.what());
callInvoker->invokeAsync(
[code, msg, promise](jsi::Runtime &runtime) {
promise->reject(
makeRnExecutorchErrorValue(runtime, code, msg));
});
return;
} catch (const std::exception &e) {
callInvoker->invokeAsync([e = std::move(e), promise]() {
promise->reject(std::string(e.what()));
});
return;
} catch (...) {
callInvoker->invokeAsync([promise]() {
promise->reject(std::string("Unknown error"));
});
return;
}
});
return;
}
});
} catch (...) {
promise->reject(std::string(
"Couldn't parse JS arguments in a native function"));
Expand All @@ -427,11 +429,8 @@ template <typename Model> class ModelHostObject : public JsiHostObject {
model->unload();
thisValue.asObject(runtime).setExternalMemoryPressure(runtime, 0);
} catch (const RnExecutorchError &e) {
jsi::Object errorData(runtime);
errorData.setProperty(runtime, "code", e.getNumericCode());
errorData.setProperty(runtime, "message",
jsi::String::createFromUtf8(runtime, e.what()));
throw jsi::JSError(runtime, jsi::Value(runtime, std::move(errorData)));
throw jsi::JSError(runtime, makeRnExecutorchErrorValue(
runtime, e.getNumericCode(), e.what()));
} catch (const std::exception &e) {
throw jsi::JSError(runtime, e.what());
} catch (...) {
Expand Down
Loading