Skip to content

Lightpanda: the headless browser designed for AI and automation

webapi: Make PermissionStatus an EventTarget

Karl Seguin198081ea2f23
diff --git a/src/browser/tests/navigator/navigator.html b/src/browser/tests/navigator/navigator.html
index 248b477fe..b8c63477e 100644
--- a/src/browser/tests/navigator/navigator.html
+++ b/src/browser/tests/navigator/navigator.html
@@ -92,6 +92,14 @@
await state.done(() => {
testing.expectEqual('prompt', status.state);
testing.expectEqual('notifications', status.name);
+ testing.expectTrue(status instanceof PermissionStatus);
+ testing.expectTrue(status instanceof EventTarget);
+ testing.expectEqual(null, status.onchange);
+ let fired = 0;
+ status.onchange = () => fired += 1;
+ status.addEventListener('change', () => fired += 1);
+ status.dispatchEvent(new Event('change'));
+ testing.expectEqual(2, fired);
});
}
</script>
diff --git a/src/browser/tests/worker/navigator-worker.js b/src/browser/tests/worker/navigator-worker.js
index f5b3171cf..8b06ad587 100644
--- a/src/browser/tests/worker/navigator-worker.js
+++ b/src/browser/tests/worker/navigator-worker.js
@@ -32,6 +32,7 @@ onmessage = async function(event) {
permissions_distinct: navigator.permissions !== navigator,
permission_name: status.name,
permission_state: status.state,
+ permission_is_target: status instanceof EventTarget,
// StorageManager
storage_quota: estimate.quota,
diff --git a/src/browser/tests/worker/worker.html b/src/browser/tests/worker/worker.html
index f5d2385a4..778474552 100644
--- a/src/browser/tests/worker/worker.html
+++ b/src/browser/tests/worker/worker.html
@@ -283,6 +283,7 @@
testing.expectEqual(true, r.permissions_distinct);
testing.expectEqual('geolocation', r.permission_name);
testing.expectEqual('prompt', r.permission_state);
+ testing.expectEqual(true, r.permission_is_target);
// StorageManager (transitive: StorageManager -> StorageEstimate)
testing.expectEqual(0, r.storage_usage);
diff --git a/src/browser/webapi/EventTarget.zig b/src/browser/webapi/EventTarget.zig
index 54ba65f31..c29d77298 100644
--- a/src/browser/webapi/EventTarget.zig
+++ b/src/browser/webapi/EventTarget.zig
@@ -34,6 +34,7 @@ const FileReader = @import("FileReader.zig");
const AbortSignal = @import("AbortSignal.zig");
const MessagePort = @import("MessagePort.zig");
const Performance = @import("Performance.zig");
+const Permissions = @import("Permissions.zig");
const Notification = @import("Notification.zig");
const SharedWorker = @import("SharedWorker.zig");
const ServiceWorker = @import("ServiceWorker.zig");
@@ -97,6 +98,7 @@ pub const Type = enum(u8) {
node,
notification,
performance,
+ permission_status,
screen,
screen_orientation,
service_worker,
@@ -140,6 +142,7 @@ pub fn Subtype(comptime tag: Type) type {
.node => Node,
.notification => Notification,
.performance => Performance,
+ .permission_status => Permissions.PermissionStatus,
.screen => Screen,
.screen_orientation => Screen.Orientation,
.service_worker => ServiceWorker,
@@ -408,6 +411,7 @@ pub fn format(self: *EventTarget, writer: *std.Io.Writer) !void {
.idb_database => writer.writeAll("<IDBDatabase>"),
.idb_transaction => writer.writeAll("<IDBTransaction>"),
.notification => writer.writeAll("<Notification>"),
+ .permission_status => writer.writeAll("<PermissionStatus>"),
.navigation_history_entry => writer.writeAll("<NavigationHistoryEntry>"),
};
}
@@ -434,6 +438,7 @@ pub fn toString(self: *EventTarget) []const u8 {
.node => return "[object Node]",
.notification => return "[object Notification]",
.performance => return "[object Performance]",
+ .permission_status => return "[object PermissionStatus]",
.screen => return "[object Screen]",
.screen_orientation => return "[object ScreenOrientation]",
.service_worker => return "[object ServiceWorker]",
diff --git a/src/browser/webapi/Permissions.zig b/src/browser/webapi/Permissions.zig
index 4c2a3650b..3defd77e8 100644
--- a/src/browser/webapi/Permissions.zig
+++ b/src/browser/webapi/Permissions.zig
@@ -20,6 +20,9 @@ const lp = @import("lightpanda");
const js = @import("../js/js.zig");
const Page = @import("../Page.zig");
+
+const EventTarget = @import("EventTarget.zig");
+
const Execution = js.Execution;
pub fn registerTypes() []const type {
@@ -48,22 +51,26 @@ pub fn query(_: *const Permissions, qd: QueryDescriptor, exec: *const Execution)
errdefer arena.release();
const state = exec.session.browser.permissions.get(qd.name) orelse .prompt;
- const status = try arena.create(PermissionStatus);
- status.* = .{
+ const status = try exec._factory.eventTargetWithAllocator(arena.allocator(), PermissionStatus{
._arena = arena,
+ ._proto = undefined,
._state = state,
._name = try arena.dupe(u8, qd.name),
- };
+ });
return exec.js.local.?.resolvePromise(status);
}
-const PermissionStatus = struct {
+pub const PermissionStatus = struct {
_rc: lp.RC = .{},
_arena: *lp.Arena,
+ _proto: *EventTarget,
_name: []const u8,
_state: State,
- pub fn deinit(self: *PermissionStatus, _: *Page) void {
+ pub const Proto = EventTarget;
+
+ pub fn deinit(self: *PermissionStatus, page: *Page) void {
+ page.removeTarget(self._proto);
self._arena.release();
}
@@ -75,6 +82,10 @@ const PermissionStatus = struct {
self._rc.acquire();
}
+ pub fn asEventTarget(self: *PermissionStatus) *EventTarget {
+ return self._proto;
+ }
+
fn getName(self: *const PermissionStatus) []const u8 {
return self._name;
}
@@ -91,6 +102,7 @@ const PermissionStatus = struct {
};
pub const name = bridge.accessor(getName, null, .{});
pub const state = bridge.accessor(getState, null, .{});
+ pub const onchange = EventTarget.handlerAccessor(PermissionStatus, "change");
};
};