Skip to content

fix: Don't throw from getters #1568

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

Closed
TartanLlama wants to merge 3 commits into from
Closed

fix: Don't throw from getters #1568

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2b84215
fix: Don't throw from getters
TartanLlama Aug 18, 2026
be0aabb
Return false from booleans
TartanLlama Aug 18, 2026
f052a35
Fix setBoolean call
TartanLlama Aug 18, 2026
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
60 changes: 30 additions & 30 deletions runtime/fastly/builtins/backend.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1376,8 +1376,8 @@ bool Backend::is_dynamic_get(JSContext *cx, unsigned argc, JS::Value *vp) {
}
auto res = backend->is_dynamic();
if (auto *err = res.to_err()) {
HANDLE_ERROR(cx, *err);
return false;
args.rval().setBoolean(false);
return true;
}
args.rval().setBoolean(res.unwrap());
return true;
Expand All @@ -1391,8 +1391,8 @@ bool Backend::target_get(JSContext *cx, unsigned argc, JS::Value *vp) {
}
auto res = backend->get_host();
if (auto *err = res.to_err()) {
HANDLE_ERROR(cx, *err);
return false;
args.rval().setNull();
return true;
}
auto str = core::decode(cx, res.unwrap());
if (!str) {
Expand All @@ -1410,8 +1410,8 @@ bool Backend::host_override_get(JSContext *cx, unsigned argc, JS::Value *vp) {
}
auto res = backend->get_override_host();
if (auto *err = res.to_err()) {
HANDLE_ERROR(cx, *err);
return false;
args.rval().setNull();
return true;
}
auto str = core::decode(cx, res.unwrap());
if (!str) {
Expand All @@ -1429,8 +1429,8 @@ bool Backend::port_get(JSContext *cx, unsigned argc, JS::Value *vp) {
}
auto res = backend->get_port();
if (auto *err = res.to_err()) {
HANDLE_ERROR(cx, *err);
return false;
args.rval().setNull();
return true;
}
args.rval().setNumber(res.unwrap());
return true;
Expand All @@ -1444,8 +1444,8 @@ bool Backend::connect_timeout_get(JSContext *cx, unsigned argc, JS::Value *vp) {
}
auto res = backend->get_connect_timeout_ms();
if (auto *err = res.to_err()) {
HANDLE_ERROR(cx, *err);
return false;
args.rval().setNull();
return true;
}
if (!res.unwrap().has_value()) {
args.rval().setNull();
Expand All @@ -1463,8 +1463,8 @@ bool Backend::first_byte_timeout_get(JSContext *cx, unsigned argc, JS::Value *vp
}
auto res = backend->get_first_byte_timeout_ms();
if (auto *err = res.to_err()) {
HANDLE_ERROR(cx, *err);
return false;
args.rval().setNull();
return true;
}
if (!res.unwrap().has_value()) {
args.rval().setNull();
Expand All @@ -1482,8 +1482,8 @@ bool Backend::between_bytes_timeout_get(JSContext *cx, unsigned argc, JS::Value
}
auto res = backend->get_between_bytes_timeout_ms();
if (auto *err = res.to_err()) {
HANDLE_ERROR(cx, *err);
return false;
args.rval().setNull();
return true;
}
if (!res.unwrap().has_value()) {
args.rval().setNull();
Expand All @@ -1501,8 +1501,8 @@ bool Backend::http_keepalive_time_get(JSContext *cx, unsigned argc, JS::Value *v
}
auto res = backend->get_http_keepalive_time();
if (auto *err = res.to_err()) {
HANDLE_ERROR(cx, *err);
return false;
args.rval().setNull();
return true;
}
args.rval().setNumber(res.unwrap());
return true;
Expand All @@ -1518,8 +1518,8 @@ bool Backend::tcp_keepalive_get(JSContext *cx, unsigned argc, JS::Value *vp) {

auto res = backend->get_tcp_keepalive_enable();
if (auto *err = res.to_err()) {
HANDLE_ERROR(cx, *err);
return false;
args.rval().setNull();
return true;
}
if (!res.unwrap()) {
args.rval().setNull();
Expand All @@ -1529,8 +1529,8 @@ bool Backend::tcp_keepalive_get(JSContext *cx, unsigned argc, JS::Value *vp) {
{
auto res = backend->get_tcp_keepalive_interval();
if (auto *err = res.to_err()) {
HANDLE_ERROR(cx, *err);
return false;
args.rval().setNull();
return true;
}
JS::RootedValue val(cx, JS_NumberValue(res.unwrap()));
if (!JS_SetProperty(cx, tcp_keepalive_obj, "intervalSecs", val)) {
Expand All @@ -1540,8 +1540,8 @@ bool Backend::tcp_keepalive_get(JSContext *cx, unsigned argc, JS::Value *vp) {
{
auto res = backend->get_tcp_keepalive_time();
if (auto *err = res.to_err()) {
HANDLE_ERROR(cx, *err);
return false;
args.rval().setNull();
return true;
}
JS::RootedValue val(cx, JS_NumberValue(res.unwrap()));
if (!JS_SetProperty(cx, tcp_keepalive_obj, "timeSecs", val)) {
Expand All @@ -1551,8 +1551,8 @@ bool Backend::tcp_keepalive_get(JSContext *cx, unsigned argc, JS::Value *vp) {
{
auto res = backend->get_tcp_keepalive_probes();
if (auto *err = res.to_err()) {
HANDLE_ERROR(cx, *err);
return false;
args.rval().setNull();
return true;
}
JS::RootedValue val(cx, JS_NumberValue(res.unwrap()));
if (!JS_SetProperty(cx, tcp_keepalive_obj, "probes", val)) {
Expand All @@ -1573,8 +1573,8 @@ bool Backend::is_ssl_get(JSContext *cx, unsigned argc, JS::Value *vp) {
}
auto res = backend->is_ssl();
if (auto *err = res.to_err()) {
HANDLE_ERROR(cx, *err);
return false;
args.rval().setBoolean(false);
return true;
}
args.rval().setBoolean(res.unwrap());
return true;
Expand All @@ -1588,8 +1588,8 @@ bool Backend::tls_min_version_get(JSContext *cx, unsigned argc, JS::Value *vp) {
}
auto res = backend->ssl_min_version();
if (auto *err = res.to_err()) {
HANDLE_ERROR(cx, *err);
return false;
args.rval().setNull();
return true;
}
if (!res.unwrap().has_value()) {
args.rval().setNull();
Expand All @@ -1607,8 +1607,8 @@ bool Backend::tls_max_version_get(JSContext *cx, unsigned argc, JS::Value *vp) {
}
auto res = backend->ssl_max_version();
if (auto *err = res.to_err()) {
HANDLE_ERROR(cx, *err);
return false;
args.rval().setNull();
return true;
}
if (!res.unwrap().has_value()) {
args.rval().setNull();
Expand Down
32 changes: 16 additions & 16 deletions runtime/fastly/builtins/fetch-event.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,8 +202,8 @@ bool ClientInfo::tls_cipher_openssl_name_get(JSContext *cx, unsigned argc, JS::V
if (!result) {
auto res = request_handle(cx, self).http_req_downstream_tls_cipher_openssl_name();
if (auto *err = res.to_err()) {
HANDLE_ERROR(cx, *err);
return false;
args.rval().setNull();
return true;
}

if (!res.unwrap().has_value()) {
Expand All @@ -228,8 +228,8 @@ bool ClientInfo::tls_ja3_md5_get(JSContext *cx, unsigned argc, JS::Value *vp) {
if (!result) {
auto res = request_handle(cx, self).http_req_downstream_tls_ja3_md5();
if (auto *err = res.to_err()) {
HANDLE_ERROR(cx, *err);
return false;
args.rval().setNull();
return true;
}

if (!res.unwrap().has_value()) {
Expand All @@ -256,8 +256,8 @@ bool ClientInfo::tls_ja4_get(JSContext *cx, unsigned argc, JS::Value *vp) {
if (!result) {
auto res = request_handle(cx, self).http_req_downstream_tls_ja4();
if (auto *err = res.to_err()) {
HANDLE_ERROR(cx, *err);
return false;
args.rval().setNull();
return true;
}

if (!res.unwrap().has_value()) {
Expand All @@ -281,8 +281,8 @@ bool ClientInfo::h2_fingerprint_get(JSContext *cx, unsigned argc, JS::Value *vp)
if (!result) {
auto res = request_handle(cx, self).http_req_downstream_client_h2_fingerprint();
if (auto *err = res.to_err()) {
HANDLE_ERROR(cx, *err);
return false;
args.rval().setNull();
return true;
}

if (!res.unwrap().has_value()) {
Expand All @@ -306,8 +306,8 @@ bool ClientInfo::oh_fingerprint_get(JSContext *cx, unsigned argc, JS::Value *vp)
if (!result) {
auto res = request_handle(cx, self).http_req_downstream_client_oh_fingerprint();
if (auto *err = res.to_err()) {
HANDLE_ERROR(cx, *err);
return false;
args.rval().setNull();
return true;
}

if (!res.unwrap().has_value()) {
Expand All @@ -331,8 +331,8 @@ bool ClientInfo::tls_client_hello_get(JSContext *cx, unsigned argc, JS::Value *v
if (!buffer) {
auto res = request_handle(cx, self).http_req_downstream_tls_client_hello();
if (auto *err = res.to_err()) {
HANDLE_ERROR(cx, *err);
return false;
args.rval().setNull();
return true;
}

if (!res.unwrap().has_value()) {
Expand Down Expand Up @@ -366,8 +366,8 @@ bool ClientInfo::tls_client_certificate_get(JSContext *cx, unsigned argc, JS::Va
if (!buffer) {
auto res = request_handle(cx, self).http_req_downstream_tls_raw_client_certificate();
if (auto *err = res.to_err()) {
HANDLE_ERROR(cx, *err);
return false;
args.rval().setNull();
return true;
}

if (!res.unwrap().has_value()) {
Expand Down Expand Up @@ -402,8 +402,8 @@ bool ClientInfo::tls_protocol_get(JSContext *cx, unsigned argc, JS::Value *vp) {
if (!result) {
auto res = request_handle(cx, self).http_req_downstream_tls_protocol();
if (auto *err = res.to_err()) {
HANDLE_ERROR(cx, *err);
return false;
args.rval().setNull();
return true;
}

if (!res.unwrap().has_value()) {
Expand Down
44 changes: 20 additions & 24 deletions runtime/fastly/builtins/fetch/request-response.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1148,12 +1148,8 @@ bool Request::isCacheable_get(JSContext *cx, unsigned argc, JS::Value *vp) {
auto handle = request_handle(self);
auto res = handle.is_cacheable();
if (auto *err = res.to_err()) {
if (host_api::error_is_unsupported(*err)) {
args.rval().setUndefined();
return true;
}
HANDLE_ERROR(cx, *err);
return false;
args.rval().setUndefined();
return true;
}

args.rval().setBoolean(res.unwrap());
Expand Down Expand Up @@ -2274,8 +2270,8 @@ bool Request::version_get(JSContext *cx, unsigned argc, JS::Value *vp) {

auto res = request_handle(self).get_version();
if (auto *err = res.to_err()) {
HANDLE_ERROR(cx, *err);
return false;
args.rval().setNull();
return true;
}

args.rval().setInt32(res.unwrap());
Expand Down Expand Up @@ -2531,8 +2527,8 @@ bool Request::bot_analyzed_get(JSContext *cx, unsigned argc, JS::Value *vp) {

auto bot_analyzed = req.http_req_downstream_bot_analyzed();
if (auto *err = bot_analyzed.to_err()) {
HANDLE_ERROR(cx, *err);
return false;
args.rval().setBoolean(false);
return true;
} else {
args.rval().setBoolean(bot_analyzed.unwrap());
return true;
Expand All @@ -2551,8 +2547,8 @@ bool Request::bot_detected_get(JSContext *cx, unsigned argc, JS::Value *vp) {

auto bot_detected = req.http_req_downstream_bot_detected();
if (auto *err = bot_detected.to_err()) {
HANDLE_ERROR(cx, *err);
return false;
args.rval().setBoolean(false);
return true;
} else {
args.rval().setBoolean(bot_detected.unwrap());
return true;
Expand All @@ -2571,8 +2567,8 @@ bool Request::bot_name_get(JSContext *cx, unsigned argc, JS::Value *vp) {

auto bot_name_res = req.http_req_downstream_bot_name();
if (auto *err = bot_name_res.to_err()) {
HANDLE_ERROR(cx, *err);
return false;
args.rval().setNull();
return true;
} else {
if (bot_name_res.unwrap().has_value()) {
auto bot_name_str = std::move(bot_name_res.unwrap().value());
Expand All @@ -2596,8 +2592,8 @@ bool Request::bot_category_get(JSContext *cx, unsigned argc, JS::Value *vp) {

auto bot_category_res = req.http_req_downstream_bot_category_kind();
if (auto *err = bot_category_res.to_err()) {
HANDLE_ERROR(cx, *err);
return false;
args.rval().setNull();
return true;
} else {
if (bot_category_res.unwrap().has_value()) {
std::string kind_str;
Expand Down Expand Up @@ -2671,8 +2667,8 @@ bool Request::bot_verified_get(JSContext *cx, unsigned argc, JS::Value *vp) {

auto bot_verified_res = req.http_req_downstream_bot_verified();
if (auto *err = bot_verified_res.to_err()) {
HANDLE_ERROR(cx, *err);
return false;
args.rval().setNull();
return true;
} else {
if (bot_verified_res.unwrap().has_value()) {
args.rval().setBoolean(bot_verified_res.unwrap().value());
Expand Down Expand Up @@ -3629,8 +3625,8 @@ bool Response::version_get(JSContext *cx, unsigned argc, JS::Value *vp) {

auto res = response_handle(self).get_version();
if (auto *err = res.to_err()) {
HANDLE_ERROR(cx, *err);
return false;
args.rval().setNull();
return true;
}

args.rval().setInt32(res.unwrap());
Expand Down Expand Up @@ -3703,8 +3699,8 @@ bool Response::ip_get(JSContext *cx, unsigned argc, JS::Value *vp) {
auto handle = response_handle(self);
auto res = handle.get_ip();
if (auto *err = res.to_err()) {
HANDLE_ERROR(cx, *err);
return false;
args.rval().setUndefined();
return true;
}

auto ret = std::move(res.unwrap());
Expand Down Expand Up @@ -3734,8 +3730,8 @@ bool Response::port_get(JSContext *cx, unsigned argc, JS::Value *vp) {
auto handle = response_handle(self);
auto res = handle.get_port();
if (auto *err = res.to_err()) {
HANDLE_ERROR(cx, *err);
return false;
args.rval().setUndefined();
return true;
}
if (!res.unwrap().has_value()) {
args.rval().setUndefined();
Expand Down
Loading