Lightpanda: the headless browser designed for AI and automation
properly pass error up to stream
Muki Kiboigo071dee9d3183
diff --git a/src/browser/webapi/net/Response.zig b/src/browser/webapi/net/Response.zigindex 0ed7a69d5..b0faf7b81 100644--- a/src/browser/webapi/net/Response.zig+++ b/src/browser/webapi/net/Response.zig@@ -590,8 +590,8 @@ const StreamConsumer = struct {try self.pumpRead();}- fn onReadRejected(self: *StreamConsumer) void {- self.finish(self.execution.js.local.?, null);+ fn onReadRejected(self: *StreamConsumer, reason: js.Value) void {+ self.finishWithReason(self.execution.js.local.?, reason);}fn concatenateChunks(self: *StreamConsumer, allocator: Allocator) ![]const u8 {@@ -608,6 +608,11 @@ const StreamConsumer = struct {self.reader.releaseLock();local.toLocal(self.resolver).rejectError("stream body", .{ .type_error = err orelse "Failed to read stream" });}++ fn finishWithReason(self: *StreamConsumer, local: *const js.Local, reason: js.Value) void {+ self.reader.releaseLock();+ local.toLocal(self.resolver).reject("stream body", reason);+ }};pub fn clone(self: *const Response, exec: *const Execution) !*Response {diff --git a/src/browser/webapi/streams/ReadableStream.zig b/src/browser/webapi/streams/ReadableStream.zigindex d819639da..72ee1bf22 100644--- a/src/browser/webapi/streams/ReadableStream.zig+++ b/src/browser/webapi/streams/ReadableStream.zig@@ -83,7 +83,22 @@ pub fn init(src_: ?UnderlyingSource, strategy_: ?QueueingStrategy, exec: *constif (src_) |src| {if (src.start) |start| {- try start.call(void, .{self._controller});+ const local = exec.js.local.?;+ var try_catch: js.TryCatch = undefined;+ try_catch.init(local);+ defer try_catch.deinit();++ start.callRethrow(void, .{self._controller}) catch |err| {+ if (err == error.JsException or err == error.TryCatchRethrow) {+ if (try_catch.exceptionValue()) |exc| {+ try self._controller.errorWithValue(exc);+ } else {+ return err;+ }+ } else {+ return err;+ }+ };}if (src.cancel) |callback| {@@ -209,10 +224,24 @@ pub fn callPullIfNeeded(self: *ReadableStream) !void {exec.js.localScope(&ls);defer ls.deinit();+ var try_catch: js.TryCatch = undefined;+ try_catch.init(&ls.local);+ defer try_catch.deinit();+// Call the pull function// Note: In a complete implementation, we'd handle the promise returned by pull// and set _pulling = false when it resolves- try ls.toLocal(func).call(void, .{self._controller});+ ls.toLocal(func).callRethrow(void, .{self._controller}) catch |err| {+ if (err == error.JsException or err == error.TryCatchRethrow) {+ if (try_catch.exceptionValue()) |exc| {+ try self._controller.errorWithValue(exc);+ } else {+ return err;+ }+ } else {+ return err;+ }+ };}self._pulling = false;diff --git a/src/browser/webapi/streams/ReadableStreamDefaultController.zig b/src/browser/webapi/streams/ReadableStreamDefaultController.zigindex 8453063b0..32778ee6e 100644--- a/src/browser/webapi/streams/ReadableStreamDefaultController.zig+++ b/src/browser/webapi/streams/ReadableStreamDefaultController.zig@@ -243,6 +243,12 @@ pub fn fail(self: *ReadableStreamDefaultController, local: *const js.Local, reas}}+/// Errors the stream with an arbitrary JS value, preserving its identity.+/// This is what the JS-facing `controller.error(e)` uses.+pub fn errorWithValue(self: *ReadableStreamDefaultController, value: js.Value) !void {+ return self.fail(value.local, value);+}+/// The caller owns the returned global and must release it.pub fn dequeue(self: *ReadableStreamDefaultController) ?js.Value.Global {if (self._queue.items.len == 0) {