Skip to content

Lightpanda: the headless browser designed for AI and automation

dedupe with handleError

Karl Seguin8b74ec9e9b2f
diff --git a/src/browser/js/Caller.zig b/src/browser/js/Caller.zig
index 43168b67a..169e070af 100644
--- a/src/browser/js/Caller.zig
+++ b/src/browser/js/Caller.zig
@@ -623,12 +623,7 @@ fn handleError(comptime T: type, comptime F: type, local: *const Local, err: any
};
if (comptime returnsPromise(F) and @TypeOf(info) == FunctionCallbackInfo) {
- // An operation that returns a promise must not throw. It rejects.
- const resolver = js.PromiseResolver.init(&err_local);
- resolver.rejectValue(.{ .local = &err_local, .handle = js_err }) catch |reject_err| {
- log.err(.bug, "handleError reject", .{ .err = reject_err });
- };
- info.getReturnValue().set(resolver.promise().toValue());
+ rejectOperation(&err_local, .{ .local = &err_local, .handle = js_err }, info);
return;
}
@@ -636,6 +631,15 @@ fn handleError(comptime T: type, comptime F: type, local: *const Local, err: any
info.getReturnValue().setValueHandle(js_exception);
}
+// An operation that returns a promise must not throw. It rejects.
+fn rejectOperation(err_local: *const Local, value: js.Value, info: FunctionCallbackInfo) void {
+ const resolver = js.PromiseResolver.init(err_local);
+ resolver.rejectValue(value) catch |err| {
+ log.err(.bug, "rejectOperation", .{ .err = err });
+ };
+ info.getReturnValue().set(resolver.promise().toValue());
+}
+
fn returnsPromise(comptime F: type) bool {
const R = @typeInfo(F).@"fn".return_type orelse return false;
const payload = switch (@typeInfo(R)) {
@@ -919,16 +923,10 @@ pub const Function = struct {
const js_value = _call(T, local, info, func, opts) catch |err| {
if (try_catch.hasCaught()) {
- const terminating = local.ctx.env.terminatePending() or
- v8.v8__Isolate__IsExecutionTerminating(local.isolate.handle);
- if (!terminating) {
+ if (local.ctx.env.terminatePending() == false) {
if (try_catch.exceptionValue()) |exception| {
const err_local = errorLocal(T, local, info);
- const resolver = js.PromiseResolver.init(&err_local);
- resolver.rejectValue(exception) catch |reject_err| {
- log.err(.bug, "callRejecting reject", .{ .err = reject_err });
- };
- info.getReturnValue().set(resolver.promise().toValue());
+ rejectOperation(&err_local, exception, info);
return null;
}
}