Lightpanda: the headless browser designed for AI and automation
`URL`: introduce `url_parse_with_base`
Halil Duraka307833e5a14
diff --git a/src/browser/webapi/URL.zig b/src/browser/webapi/URL.zigindex a92e52ad3..8ded011ac 100644--- a/src/browser/webapi/URL.zig+++ b/src/browser/webapi/URL.zig@@ -41,24 +41,14 @@ pub const eqlDocument = @import("../URL.zig").eqlDocument;pub fn init(url: []const u8, maybe_base: ?[]const u8, exec: *const Execution) !*URL {// NOTE: about:blank address is valid in rust-url.-var err: i32 = 0;- if (maybe_base) |base| {- const base_url = U_.url_parse(base.ptr, base.len, &err) orelse return error.TypeError;- errdefer U_.url_free(base_url);-- const joined_url = U_.url_join(base_url, url.ptr, url.len, &err) orelse return error.TypeError;- errdefer U_.url_free(joined_url);- // `base_url` has no use now.- U_.url_free(base_url);-- return exec._factory.create(URL{ ._url = joined_url });- }-- const u = U_.url_parse(url.ptr, url.len, &err) orelse {- return error.TypeError;+ const u = blk: {+ if (maybe_base) |base| {+ break :blk U.url_parse_with_base(base.ptr, base.len, url.ptr, url.len, &err) orelse return error.TypeError;+ }+ break :blk U.url_parse(url.ptr, url.len, &err) orelse return error.TypeError;};- errdefer U_.url_free(u);+ errdefer U.url_free(u);return exec._factory.create(URL{ ._url = u });}diff --git a/src/html5ever/url.rs b/src/html5ever/url.rsindex f3d7aef82..55d14c2ad 100644--- a/src/html5ever/url.rs+++ b/src/html5ever/url.rs@@ -102,6 +102,44 @@ pub unsafe extern "C" fn url_parse(ptr: *const c_uchar, len: usize, err: *mut i3}}+#[no_mangle]+pub unsafe extern "C" fn url_parse_with_base(+ base_ptr: *const c_uchar,+ base_len: usize,+ ptr: *const c_uchar,+ len: usize,+ err: *mut i32,+) -> *mut Url {+ let base_slice = match str_from(base_ptr, base_len) {+ Some(s) => s,+ None => {+ *err = url::ParseError::EmptyHost as i32;+ return std::ptr::null_mut();+ }+ };+ let slice = match str_from(ptr, len) {+ Some(s) => s,+ None => {+ *err = url::ParseError::EmptyHost as i32;+ return std::ptr::null_mut();+ }+ };++ match Url::parse(base_slice) {+ Ok(base) => match base.join(slice) {+ Ok(url) => Box::into_raw(Box::new(url)),+ Err(e) => {+ *err = e as i32;+ std::ptr::null_mut()+ }+ },+ Err(e) => {+ *err = e as i32;+ std::ptr::null_mut()+ }+ }+}+#[no_mangle]pub unsafe extern "C" fn url_join(base: *const Url,diff --git a/src/sys/url.zig b/src/sys/url.zigindex b5f075d36..dd0d46928 100644--- a/src/sys/url.zig+++ b/src/sys/url.zig@@ -51,6 +51,9 @@ pub const ParseError = enum(i32) {/// If return value is null, `err` indicates `ParseError`.pub extern "c" fn url_parse(ptr: [*]const u8, len: usize, err: *i32) ?*Url;/// If return value is null, `err` indicates `ParseError`.+/// More efficient than url_parse + url_join combination where possible.+pub extern "c" fn url_parse_with_base(base_ptr: [*]const u8, base_len: usize, ptr: [*]const u8, len: usize, err: *i32) ?*Url;+/// If return value is null, `err` indicates `ParseError`.pub extern "c" fn url_join(base: *const Url, ptr: [*]const u8, len: usize, err: *i32) ?*Url;pub extern "c" fn url_free(url: *Url) void;pub extern "c" fn url_can_parse(ptr: [*]const u8, len: usize) bool;