Lightpanda: the headless browser designed for AI and automation
`TransformStream`: a host-side given transformer can take userdata and flush now
Halil Durak59c78b7ea040
diff --git a/src/browser/webapi/encoding/TextDecoderStream.zig b/src/browser/webapi/encoding/TextDecoderStream.zigindex d37aa6f66..c5cc2ad71 100644--- a/src/browser/webapi/encoding/TextDecoderStream.zig+++ b/src/browser/webapi/encoding/TextDecoderStream.zig@@ -51,20 +51,20 @@ pub fn init(label_: ?[]const u8, opts_: ?InitOpts, exec: *const Execution) !Textconst decodeFn: TransformStream.ZigTransformFn = blk: {if (opts.ignoreBOM) {break :blk struct {- fn decode(controller: *TransformStream.DefaultController, chunk: js.Value) !void {+ fn decode(_: ?*anyopaque, controller: *TransformStream.DefaultController, chunk: js.Value) !void {return decodeTransform(controller, chunk, true);}}.decode;} else {break :blk struct {- fn decode(controller: *TransformStream.DefaultController, chunk: js.Value) !void {+ fn decode(_: ?*anyopaque, controller: *TransformStream.DefaultController, chunk: js.Value) !void {return decodeTransform(controller, chunk, false);}}.decode;}};- const transform = try TransformStream.initWithZigTransform(decodeFn, exec);+ const transform = try TransformStream.initWithZigTransformer(.{ .transform = decodeFn }, exec);return .{._transform = transform,diff --git a/src/browser/webapi/encoding/TextEncoderStream.zig b/src/browser/webapi/encoding/TextEncoderStream.zigindex df101bcb0..f1977e4e8 100644--- a/src/browser/webapi/encoding/TextEncoderStream.zig+++ b/src/browser/webapi/encoding/TextEncoderStream.zig@@ -29,13 +29,13 @@ const TextEncoderStream = @This();_transform: *TransformStream,pub fn init(exec: *const Execution) !TextEncoderStream {- const transform = try TransformStream.initWithZigTransform(&encodeTransform, exec);+ const transform = try TransformStream.initWithZigTransformer(.{ .transform = &encodeTransform }, exec);return .{._transform = transform,};}-fn encodeTransform(controller: *TransformStream.DefaultController, chunk: js.Value) !void {+fn encodeTransform(_: ?*anyopaque, controller: *TransformStream.DefaultController, chunk: js.Value) !void {// chunk should be a JS string; encode it as UTF-8 bytes (Uint8Array)const str = chunk.isString() orelse return error.InvalidChunk;const slice = try str.toSlice();diff --git a/src/browser/webapi/streams/TransformStream.zig b/src/browser/webapi/streams/TransformStream.zigindex 775eff29d..c57f30fda 100644--- a/src/browser/webapi/streams/TransformStream.zig+++ b/src/browser/webapi/streams/TransformStream.zig@@ -28,7 +28,15 @@ const TransformStream = @This();pub const DefaultController = TransformStreamDefaultController;-pub const ZigTransformFn = *const fn (*TransformStreamDefaultController, js.Value) anyerror!void;+pub const ZigTransformFn = *const fn (ctx: ?*anyopaque, *TransformStreamDefaultController, js.Value) anyerror!void;+pub const ZigFlushFn = *const fn (ctx: ?*anyopaque, *TransformStreamDefaultController) anyerror!void;++/// A transformer implemented in Zig; `ctx` is passed back to both callbacks.+pub const ZigTransformer = struct {+ ctx: ?*anyopaque = null,+ transform: ZigTransformFn,+ flush: ?ZigFlushFn = null,+};_readable: *ReadableStream,_writable: *WritableStream,@@ -40,7 +48,7 @@ const Transformer = struct {transform: ?js.Function.Global = null,};-pub fn init(transformer_: ?Transformer, exec: *const Execution) !*TransformStream {+pub fn init(maybe_transformer: ?Transformer, exec: *const Execution) !*TransformStream {const readable = try ReadableStream.init(null, null, exec);const self = try exec._factory.create(TransformStream{@@ -49,27 +57,31 @@ pub fn init(transformer_: ?Transformer, exec: *const Execution) !*TransformStrea._controller = undefined,});+ const flush_fn, const start_fn, const transform_fn = blk: {+ if (maybe_transformer) |t| {+ break :blk .{ t.flush, t.start, t.transform };+ }+ break :blk .{ null, null, null };+ };+const transform_controller = try TransformStreamDefaultController.init(self,- if (transformer_) |t| t.transform else null,- if (transformer_) |t| t.flush else null,+ transform_fn,+ flush_fn,null,exec,);self._controller = transform_controller;-self._writable = try WritableStream.initForTransform(self, exec);- if (transformer_) |transformer| {- if (transformer.start) |start| {- try start.call(void, .{transform_controller});- }+ if (start_fn) |start| {+ try start.call(void, .{transform_controller});}return self;}-pub fn initWithZigTransform(zig_transform: ZigTransformFn, exec: *const Execution) !*TransformStream {+pub fn initWithZigTransformer(zig_transformer: ZigTransformer, exec: *const Execution) !*TransformStream {const readable = try ReadableStream.init(null, null, exec);const self = try exec._factory.create(TransformStream{@@ -78,7 +90,7 @@ pub fn initWithZigTransform(zig_transform: ZigTransformFn, exec: *const Executio._controller = undefined,});- const transform_controller = try TransformStreamDefaultController.init(self, null, null, zig_transform, exec);+ const transform_controller = try TransformStreamDefaultController.init(self, null, null, zig_transformer, exec);self._controller = transform_controller;self._writable = try WritableStream.initForTransform(self, exec);@@ -86,10 +98,9 @@ pub fn initWithZigTransform(zig_transform: ZigTransformFn, exec: *const Executio}pub fn transformWrite(self: *TransformStream, chunk: js.Value, exec: *const Execution) !void {- if (self._controller._zig_transform_fn) |zig_fn| {+ if (self._controller._zig_transformer) |zig| {// Zig-level transform (used by TextEncoderStream etc.)- try zig_fn(self._controller, chunk);- return;+ return zig.transform(zig.ctx, self._controller, chunk);}if (self._controller._transform_fn) |transform_fn| {@@ -104,7 +115,11 @@ pub fn transformWrite(self: *TransformStream, chunk: js.Value, exec: *const Exec}pub fn transformClose(self: *TransformStream, exec: *const Execution) !void {- if (self._controller._flush_fn) |flush_fn| {+ if (self._controller._zig_transformer) |zig| {+ if (zig.flush) |flush| {+ try flush(zig.ctx, self._controller);+ }+ } else if (self._controller._flush_fn) |flush_fn| {var ls: js.Local.Scope = undefined;exec.js.localScope(&ls);defer ls.deinit();@@ -148,20 +163,20 @@ pub const TransformStreamDefaultController = struct {_stream: *TransformStream,_transform_fn: ?js.Function.Global,_flush_fn: ?js.Function.Global,- _zig_transform_fn: ?ZigTransformFn,+ _zig_transformer: ?ZigTransformer,pub fn init(stream: *TransformStream,transform_fn: ?js.Function.Global,flush_fn: ?js.Function.Global,- zig_transform_fn: ?ZigTransformFn,+ zig_transformer: ?ZigTransformer,exec: *const Execution,) !*TransformStreamDefaultController {return exec._factory.create(TransformStreamDefaultController{._stream = stream,._transform_fn = transform_fn,._flush_fn = flush_fn,- ._zig_transform_fn = zig_transform_fn,+ ._zig_transformer = zig_transformer,});}