From b3f7fb7be3f5a01816a265fb875cebee7f7d86bc Mon Sep 17 00:00:00 2001 From: Pierre Tachoire Date: Sun, 29 Dec 2024 12:30:37 +0100 Subject: [PATCH 1/5] dom: implement navigator.userAgent --- src/browser/browser.zig | 5 +++- src/html/html.zig | 2 ++ src/html/navigator.zig | 56 +++++++++++++++++++++++++++++++++++++++++ src/html/window.zig | 10 +++++++- src/run_tests.zig | 5 ++-- src/wpt/run.zig | 2 +- 6 files changed, 75 insertions(+), 5 deletions(-) create mode 100644 src/html/navigator.zig diff --git a/src/browser/browser.zig b/src/browser/browser.zig index 1e74a8a9..d8178cbb 100644 --- a/src/browser/browser.zig +++ b/src/browser/browser.zig @@ -46,12 +46,15 @@ const polyfill = @import("../polyfill/polyfill.zig"); const log = std.log.scoped(.browser); +const user_agent = "Lightpanda.io/1.0"; + // Browser is an instance of the browser. // You can create multiple browser instances. // A browser contains only one session. // TODO allow multiple sessions per browser. pub const Browser = struct { session: Session = undefined, + agent: []const u8 = user_agent, const uri = "about:blank"; @@ -111,7 +114,7 @@ pub const Session = struct { .uri = uri, .alloc = alloc, .arena = std.heap.ArenaAllocator.init(alloc), - .window = Window.create(null), + .window = Window.create(null, .{ .agent = user_agent }), .loader = Loader.init(alloc), .storageShed = storage.Shed.init(alloc), .httpClient = undefined, diff --git a/src/html/html.zig b/src/html/html.zig index 3161e694..2bb439d1 100644 --- a/src/html/html.zig +++ b/src/html/html.zig @@ -21,6 +21,7 @@ const generate = @import("../generate.zig"); const HTMLDocument = @import("document.zig").HTMLDocument; const HTMLElem = @import("elements.zig"); const Window = @import("window.zig").Window; +const Navigator = @import("navigator.zig").Navigator; pub const Interfaces = generate.Tuple(.{ HTMLDocument, @@ -28,4 +29,5 @@ pub const Interfaces = generate.Tuple(.{ HTMLElem.HTMLMediaElement, HTMLElem.Interfaces, Window, + Navigator, }); diff --git a/src/html/navigator.zig b/src/html/navigator.zig new file mode 100644 index 00000000..15253593 --- /dev/null +++ b/src/html/navigator.zig @@ -0,0 +1,56 @@ +// Copyright (C) 2023-2024 Lightpanda (Selecy SAS) +// +// Francis Bouvier +// Pierre Tachoire +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + +const std = @import("std"); + +const parser = @import("netsurf"); +const jsruntime = @import("jsruntime"); +const Callback = jsruntime.Callback; +const CallbackArg = jsruntime.CallbackArg; +const Loop = jsruntime.Loop; + +const Case = jsruntime.test_utils.Case; +const checkCases = jsruntime.test_utils.checkCases; + +const EventTarget = @import("../dom/event_target.zig").EventTarget; + +const storage = @import("../storage/storage.zig"); + +// https://html.spec.whatwg.org/multipage/system-state.html#navigator +pub const Navigator = struct { + pub const mem_guarantied = true; + + agent: []const u8 = "", + + pub fn get_userAgent(self: *Navigator) []const u8 { + return self.agent; + } +}; + +// Tests +// ----- + +pub fn testExecFn( + _: std.mem.Allocator, + js_env: *jsruntime.Env, +) anyerror!void { + var navigator = [_]Case{ + .{ .src = "navigator.userAgent", .ex = "" }, + }; + try checkCases(js_env, &navigator); +} diff --git a/src/html/window.zig b/src/html/window.zig index b81c91ba..414b660d 100644 --- a/src/html/window.zig +++ b/src/html/window.zig @@ -25,6 +25,7 @@ const CallbackArg = jsruntime.CallbackArg; const Loop = jsruntime.Loop; const EventTarget = @import("../dom/event_target.zig").EventTarget; +const Navigator = @import("navigator.zig").Navigator; const storage = @import("../storage/storage.zig"); @@ -48,9 +49,12 @@ pub const Window = struct { timeoutid: u32 = 0, timeoutids: [512]u64 = undefined, - pub fn create(target: ?[]const u8) Window { + navigator: Navigator, + + pub fn create(target: ?[]const u8, navigator: ?Navigator) Window { return Window{ .target = target orelse "", + .navigator = navigator orelse .{}, }; } @@ -66,6 +70,10 @@ pub const Window = struct { return self; } + pub fn get_navigator(self: *Window) *Navigator { + return &self.navigator; + } + pub fn get_self(self: *Window) *Window { return self; } diff --git a/src/run_tests.zig b/src/run_tests.zig index b506e5aa..077e56e2 100644 --- a/src/run_tests.zig +++ b/src/run_tests.zig @@ -96,7 +96,7 @@ fn testExecFn( }); // alias global as self and window - var window = Window.create(null); + var window = Window.create(null, null); window.replaceDocument(doc); window.setStorageShelf(&storageShelf); @@ -137,6 +137,7 @@ fn testsAllExecFn( HTMLElementTestExecFn, MutationObserverTestExecFn, @import("polyfill/fetch.zig").testExecFn, + @import("html/navigator.zig").testExecFn, }; inline for (testFns) |testFn| { @@ -359,7 +360,7 @@ test "bug document html parsing #4" { } test "Window is a libdom event target" { - var window = Window.create(null); + var window = Window.create(null, null); const event = try parser.eventCreate(); try parser.eventInit(event, "foo", .{}); diff --git a/src/wpt/run.zig b/src/wpt/run.zig index 07c3f740..208078b9 100644 --- a/src/wpt/run.zig +++ b/src/wpt/run.zig @@ -90,7 +90,7 @@ pub fn run(arena: *std.heap.ArenaAllocator, comptime dir: []const u8, f: []const } // setup global env vars. - var window = Window.create(null); + var window = Window.create(null, null); window.replaceDocument(html_doc); window.setStorageShelf(&storageShelf); try js_env.bindGlobal(&window); From 3cb77c0a3203c8e9ba81df6ccdbed0e4d5b35be6 Mon Sep 17 00:00:00 2001 From: Pierre Tachoire Date: Mon, 30 Dec 2024 11:23:32 +0100 Subject: [PATCH 2/5] dom: implement navigatorID --- src/browser/browser.zig | 2 +- src/browser/loader.zig | 2 +- src/html/navigator.zig | 33 +++++++++++++++++++++++++++++++-- 3 files changed, 33 insertions(+), 4 deletions(-) diff --git a/src/browser/browser.zig b/src/browser/browser.zig index d8178cbb..6587e43f 100644 --- a/src/browser/browser.zig +++ b/src/browser/browser.zig @@ -46,7 +46,7 @@ const polyfill = @import("../polyfill/polyfill.zig"); const log = std.log.scoped(.browser); -const user_agent = "Lightpanda.io/1.0"; +pub const user_agent = "Lightpanda/1.0"; // Browser is an instance of the browser. // You can create multiple browser instances. diff --git a/src/browser/loader.zig b/src/browser/loader.zig index 62a79fe0..480ec4c1 100644 --- a/src/browser/loader.zig +++ b/src/browser/loader.zig @@ -19,7 +19,7 @@ const std = @import("std"); const Client = @import("../http/Client.zig"); -const user_agent = "Lightpanda.io/1.0"; +const user_agent = @import("browser.zig").user_agent; pub const Loader = struct { client: Client, diff --git a/src/html/navigator.zig b/src/html/navigator.zig index 15253593..5e91c61f 100644 --- a/src/html/navigator.zig +++ b/src/html/navigator.zig @@ -18,6 +18,7 @@ const std = @import("std"); +const builtin = @import("builtin"); const parser = @import("netsurf"); const jsruntime = @import("jsruntime"); const Callback = jsruntime.Callback; @@ -35,11 +36,38 @@ const storage = @import("../storage/storage.zig"); pub const Navigator = struct { pub const mem_guarantied = true; - agent: []const u8 = "", + agent: []const u8 = "Lightpanda/1.0", + version: []const u8 = "1.0", + vendor: []const u8 = "", + platform: []const u8 = std.fmt.comptimePrint("{any} {any}", .{ builtin.os.tag, builtin.cpu.arch }), pub fn get_userAgent(self: *Navigator) []const u8 { return self.agent; } + pub fn get_appCodeName(_: *Navigator) []const u8 { + return "Mozilla"; + } + pub fn get_appName(_: *Navigator) []const u8 { + return "Netscape"; + } + pub fn get_appVersion(self: *Navigator) []const u8 { + return self.version; + } + pub fn get_platform(self: *Navigator) []const u8 { + return self.platform; + } + pub fn get_product(_: *Navigator) []const u8 { + return "Gecko"; + } + pub fn get_productSub(_: *Navigator) []const u8 { + return "20030107"; + } + pub fn get_vendor(self: *Navigator) []const u8 { + return self.vendor; + } + pub fn get_vendorSub(_: *Navigator) []const u8 { + return ""; + } }; // Tests @@ -50,7 +78,8 @@ pub fn testExecFn( js_env: *jsruntime.Env, ) anyerror!void { var navigator = [_]Case{ - .{ .src = "navigator.userAgent", .ex = "" }, + .{ .src = "navigator.userAgent", .ex = "Lightpanda/1.0" }, + .{ .src = "navigator.appVersion", .ex = "1.0" }, }; try checkCases(js_env, &navigator); } From b96644d8933c5154f6dc43671237f36ca29942d9 Mon Sep 17 00:00:00 2001 From: Pierre Tachoire Date: Mon, 30 Dec 2024 11:29:16 +0100 Subject: [PATCH 3/5] dom: implement navigatorLanguage --- src/html/navigator.zig | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/html/navigator.zig b/src/html/navigator.zig index 5e91c61f..14fb11d9 100644 --- a/src/html/navigator.zig +++ b/src/html/navigator.zig @@ -41,6 +41,8 @@ pub const Navigator = struct { vendor: []const u8 = "", platform: []const u8 = std.fmt.comptimePrint("{any} {any}", .{ builtin.os.tag, builtin.cpu.arch }), + language: []const u8 = "en-US", + pub fn get_userAgent(self: *Navigator) []const u8 { return self.agent; } @@ -68,6 +70,13 @@ pub const Navigator = struct { pub fn get_vendorSub(_: *Navigator) []const u8 { return ""; } + pub fn get_language(self: *Navigator) []const u8 { + return self.language; + } + // TODO wait for arrays. + //pub fn get_languages(self: *Navigator) [][]const u8 { + // return .{self.language}; + //} }; // Tests @@ -80,6 +89,7 @@ pub fn testExecFn( var navigator = [_]Case{ .{ .src = "navigator.userAgent", .ex = "Lightpanda/1.0" }, .{ .src = "navigator.appVersion", .ex = "1.0" }, + .{ .src = "navigator.language", .ex = "en-US" }, }; try checkCases(js_env, &navigator); } From 2af4545e10c66eca0717d900e14d1d1008adeffa Mon Sep 17 00:00:00 2001 From: Pierre Tachoire Date: Mon, 30 Dec 2024 11:50:49 +0100 Subject: [PATCH 4/5] dom: implement more navigator API --- src/html/navigator.zig | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/html/navigator.zig b/src/html/navigator.zig index 14fb11d9..b02c4fab 100644 --- a/src/html/navigator.zig +++ b/src/html/navigator.zig @@ -77,6 +77,21 @@ pub const Navigator = struct { //pub fn get_languages(self: *Navigator) [][]const u8 { // return .{self.language}; //} + pub fn get_online(_: *Navigator) bool { + return true; + } + pub fn _registerProtocolHandler(_: *Navigator, scheme: []const u8, url: []const u8) void { + _ = scheme; + _ = url; + } + pub fn _unregisterProtocolHandler(_: *Navigator, scheme: []const u8, url: []const u8) void { + _ = scheme; + _ = url; + } + + pub fn get_cookieEnabled(_: *Navigator) bool { + return true; + } }; // Tests From b391eafc388292cf09341b07b22819f1ed5ad6f4 Mon Sep 17 00:00:00 2001 From: Pierre Tachoire Date: Wed, 8 Jan 2025 11:33:56 +0100 Subject: [PATCH 5/5] wpt: update tests --- tests/wpt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/wpt b/tests/wpt index e0a721a3..ea16a1e3 160000 --- a/tests/wpt +++ b/tests/wpt @@ -1 +1 @@ -Subproject commit e0a721a3b86050ddd9f4d671db12aee0a1939661 +Subproject commit ea16a1e361daf4fa68a18b50cd006e90651bf03a