Lightpanda: the headless browser designed for AI and automation
Explicit removeTarget on self-contained types
Karl Seguin549a09f34d6f
diff --git a/src/browser/webapi/FileReader.zig b/src/browser/webapi/FileReader.zigindex 271757306..e03dbf273 100644--- a/src/browser/webapi/FileReader.zig+++ b/src/browser/webapi/FileReader.zig@@ -78,7 +78,7 @@ pub fn init(exec: *Execution) !*FileReader {});}-pub fn deinit(self: *FileReader, _: *Page) void {+pub fn deinit(self: *FileReader, page: *Page) void {if (self._on_abort) |func| func.release();if (self._on_error) |func| func.release();if (self._on_load) |func| func.release();@@ -86,6 +86,7 @@ pub fn deinit(self: *FileReader, _: *Page) void {if (self._on_load_start) |func| func.release();if (self._on_progress) |func| func.release();+ page.event_listeners.removeTarget(self.asEventTarget());self._arena.release();}diff --git a/src/browser/webapi/Notification.zig b/src/browser/webapi/Notification.zigindex 7ea7c6dfe..5f3de9677 100644--- a/src/browser/webapi/Notification.zig+++ b/src/browser/webapi/Notification.zig@@ -79,7 +79,8 @@ pub fn init(title: []const u8, options_: ?Options, exec: *const Execution) !*Not});}-pub fn deinit(self: *Notification, _: *Page) void {+pub fn deinit(self: *Notification, page: *Page) void {+ page.event_listeners.removeTarget(self._proto);self._arena.release();}diff --git a/src/browser/webapi/animation/Animation.zig b/src/browser/webapi/animation/Animation.zigindex cf1c26fd4..c658175b5 100644--- a/src/browser/webapi/animation/Animation.zig+++ b/src/browser/webapi/animation/Animation.zig@@ -68,7 +68,8 @@ pub fn init(frame: *Frame) !*Animation {});}-pub fn deinit(self: *Animation, _: *Page) void {+pub fn deinit(self: *Animation, page: *Page) void {+ page.event_listeners.removeTarget(self.asEventTarget());self._arena.release();}diff --git a/src/browser/webapi/net/EventSource.zig b/src/browser/webapi/net/EventSource.zigindex 3a432e703..8a2275570 100644--- a/src/browser/webapi/net/EventSource.zig+++ b/src/browser/webapi/net/EventSource.zig@@ -128,7 +128,7 @@ pub fn init(url: []const u8, opts_: ?Opts, exec: *const Execution) !*EventSourcereturn self;}-pub fn deinit(self: *EventSource, _: *Page) void {+pub fn deinit(self: *EventSource, page: *Page) void {self._ready_state = .closed;if (self._transfer) |transfer| {self._transfer = null;@@ -145,6 +145,7 @@ pub fn deinit(self: *EventSource, _: *Page) void {func.release();}+ page.event_listeners.removeTarget(self.asEventTarget());self._arena.release();}diff --git a/src/browser/webapi/net/WebSocket.zig b/src/browser/webapi/net/WebSocket.zigindex ab03b3fa1..004f3b333 100644--- a/src/browser/webapi/net/WebSocket.zig+++ b/src/browser/webapi/net/WebSocket.zig@@ -309,6 +309,7 @@ pub fn deinit(self: *WebSocket, page: *Page) void {arena.release();}+ page.event_listeners.removeTarget(self.asEventTarget());self._arena.release();}diff --git a/src/browser/webapi/net/XMLHttpRequest.zig b/src/browser/webapi/net/XMLHttpRequest.zigindex f9f8e54fe..950d4e2d4 100644--- a/src/browser/webapi/net/XMLHttpRequest.zig+++ b/src/browser/webapi/net/XMLHttpRequest.zig@@ -152,7 +152,9 @@ pub fn deinit(self: *XMLHttpRequest, page: *Page) void {self._proto.releaseListeners();if (self._upload) |upload| {upload._proto.releaseListeners();+ page.event_listeners.removeTarget(upload.asEventTarget());}+ page.event_listeners.removeTarget(self.asEventTarget());self._arena.release();}@@ -934,3 +936,41 @@ test "WebApi: XHR" {test "WebApi: XHR in worker" {try testing.htmlRunner("net/xhr_worker.html", .{});}++test "WebApi: XHR listeners are dropped when the XHR is freed" {+ // A freed XHR's address gets reused by a new one, which must not inherit+ // the old one's listeners.+ const frame = try testing.createFrame();+ defer testing.test_session.closeAllPages();++ {+ var ls: js.Local.Scope = undefined;+ frame.js.localScope(&ls);+ defer ls.deinit();+ _ = try ls.local.exec(+ \\globalThis.fired = 0;+ \\for (let i = 0; i < 200; i++) {+ \\ new XMLHttpRequest().addEventListener('foo', () => fired++);+ \\ new XMLHttpRequest().upload.addEventListener('foo', () => fired++);+ \\}+ , null);+ }++ // Not env.memoryPressureNotification: it skips small heaps.+ const isolate = testing.test_session.browser.env.isolate;+ for (0..3) |_| {+ isolate.memoryPressureNotification(.critical);+ }++ var ls: js.Local.Scope = undefined;+ frame.js.localScope(&ls);+ defer ls.deinit();+ const fired = try ls.local.exec(+ \\for (let i = 0; i < 200; i++) {+ \\ new XMLHttpRequest().dispatchEvent(new Event('foo'));+ \\ new XMLHttpRequest().upload.dispatchEvent(new Event('foo'));+ \\}+ \\fired;+ , null);+ try testing.expectEqual(0, try fired.toF64());+}diff --git a/src/browser/webapi/storage/idb/IDBTransaction.zig b/src/browser/webapi/storage/idb/IDBTransaction.zigindex f48f4bf8c..66ca64df3 100644--- a/src/browser/webapi/storage/idb/IDBTransaction.zig+++ b/src/browser/webapi/storage/idb/IDBTransaction.zig@@ -90,6 +90,9 @@ _gate_waiter: Engine.GateWaiter,// versionchange only: the version to fall back to if the upgrade aborts._old_version: ?i64 = null,_abort_requests: std.ArrayList(*IDBRequest) = .empty,+// Every request created under the transaction. They live in our arena, so+// their listeners have to be dropped when it's released.+_requests: std.ArrayList(*IDBRequest) = .empty,_abort_pending: bool = false,// A transaction is only active for one execution of a Scheduler's task. We// capture the scheduler's generation here and reject any request made in a@@ -185,7 +188,7 @@ pub fn initVersionChange(db: *IDBDatabase, exec: *Execution) !*IDBTransaction {return self;}-pub fn deinit(self: *IDBTransaction, _: *Page) void {+pub fn deinit(self: *IDBTransaction, page: *Page) void {if (comptime lp.IS_DEBUG) {// Pins hold refs, so the last release can't happen while parked (nor// while a drain task is scheduled).@@ -197,6 +200,10 @@ pub fn deinit(self: *IDBTransaction, _: *Page) void {for (self._clones.items) |*slot| {slot.release();}+ for (self._requests.items) |request| {+ page.event_listeners.removeTarget(request.asEventTarget());+ }+ page.event_listeners.removeTarget(self.asEventTarget());self._arena.release();}@@ -504,6 +511,7 @@ pub fn ensureBegun(self: *IDBTransaction) !void {pub fn newRequest(self: *IDBTransaction) !*IDBRequest {const request = try self._exec._factory.eventTargetWithAllocator(self._arena.allocator(), IDBRequest{ ._proto = undefined });request._txn = .{ .owned = self };+ try self._requests.append(self._arena.allocator(), request);return request;}