Lightpanda: the headless browser designed for AI and automation
update intercepted type from u8 to u32
Karl Seguin8350076972a8
diff --git a/build.zig.zon b/build.zig.zonindex e9d41446a..90b0a1be6 100644--- a/build.zig.zon+++ b/build.zig.zon@@ -5,7 +5,7 @@.minimum_zig_version = "0.15.2",.dependencies = .{.v8 = .{- .url = "https://github.com/lightpanda-io/zig-v8-fork/archive/3a53a258e508ea6a805654a94339b9fd006e7b2d.tar.gz",+ .url = "https://github.com/lightpanda-io/zig-v8-fork/archive/8bb45873631bf2c419a7eeb452f5f65fcb18c609.tar.gz",.hash = "v8-0.0.0-xddH65qdBAA1hmB-gqEmhEzO0-aXKyEsmo1s34mssemb",},// .v8 = .{ .path = "../zig-v8-fork" },diff --git a/src/browser/js/Caller.zig b/src/browser/js/Caller.zigindex 8b2d782cc..55daf7c32 100644--- a/src/browser/js/Caller.zig+++ b/src/browser/js/Caller.zig@@ -173,7 +173,7 @@ fn _constructor(self: *Caller, func: anytype, info: FunctionCallbackInfo, comptiinfo.getReturnValue().set(this.handle);}-pub fn getIndex(self: *Caller, comptime T: type, func: anytype, idx: u32, handle: *const v8.PropertyCallbackInfo, comptime opts: CallOpts) u8 {+pub fn getIndex(self: *Caller, comptime T: type, func: anytype, idx: u32, handle: *const v8.PropertyCallbackInfo, comptime opts: CallOpts) u32 {const local = &self.local;var hs: js.HandleScope = undefined;@@ -183,11 +183,11 @@ pub fn getIndex(self: *Caller, comptime T: type, func: anytype, idx: u32, handleconst info = PropertyCallbackInfo{ .handle = handle };return _getIndex(T, local, func, idx, info, opts) catch |err| {handleError(T, @TypeOf(func), local, err, info, opts);- return 1;+ return js.Intercepted.no;};}-fn _getIndex(comptime T: type, local: *const Local, func: anytype, idx: u32, info: PropertyCallbackInfo, comptime opts: CallOpts) !u8 {+fn _getIndex(comptime T: type, local: *const Local, func: anytype, idx: u32, info: PropertyCallbackInfo, comptime opts: CallOpts) !u32 {const F = @TypeOf(func);var args: ParameterTypes(F) = undefined;@field(args, "0") = try TaggedOpaque.fromJS(*T, info.getThis());@@ -199,7 +199,7 @@ fn _getIndex(comptime T: type, local: *const Local, func: anytype, idx: u32, infreturn handleIndexedReturn(T, F, true, local, ret, info, opts);}-pub fn getNamedIndex(self: *Caller, comptime T: type, func: anytype, name: *const v8.Name, handle: *const v8.PropertyCallbackInfo, comptime opts: CallOpts) u8 {+pub fn getNamedIndex(self: *Caller, comptime T: type, func: anytype, name: *const v8.Name, handle: *const v8.PropertyCallbackInfo, comptime opts: CallOpts) u32 {const local = &self.local;var hs: js.HandleScope = undefined;@@ -209,11 +209,11 @@ pub fn getNamedIndex(self: *Caller, comptime T: type, func: anytype, name: *consconst info = PropertyCallbackInfo{ .handle = handle };return _getNamedIndex(T, local, func, name, info, opts) catch |err| {handleError(T, @TypeOf(func), local, err, info, opts);- return 1;+ return js.Intercepted.no;};}-fn _getNamedIndex(comptime T: type, local: *const Local, func: anytype, name: *const v8.Name, info: PropertyCallbackInfo, comptime opts: CallOpts) !u8 {+fn _getNamedIndex(comptime T: type, local: *const Local, func: anytype, name: *const v8.Name, info: PropertyCallbackInfo, comptime opts: CallOpts) !u32 {const F = @TypeOf(func);var args: ParameterTypes(F) = undefined;@field(args, "0") = try TaggedOpaque.fromJS(*T, info.getThis());@@ -225,7 +225,7 @@ fn _getNamedIndex(comptime T: type, local: *const Local, func: anytype, name: *creturn handleIndexedReturn(T, F, true, local, ret, info, opts);}-pub fn setNamedIndex(self: *Caller, comptime T: type, func: anytype, name: *const v8.Name, js_value: *const v8.Value, handle: *const v8.PropertyCallbackInfo, comptime opts: CallOpts) u8 {+pub fn setNamedIndex(self: *Caller, comptime T: type, func: anytype, name: *const v8.Name, js_value: *const v8.Value, handle: *const v8.PropertyCallbackInfo, comptime opts: CallOpts) u32 {const local = &self.local;var hs: js.HandleScope = undefined;@@ -235,11 +235,11 @@ pub fn setNamedIndex(self: *Caller, comptime T: type, func: anytype, name: *consconst info = PropertyCallbackInfo{ .handle = handle };return _setNamedIndex(T, local, func, name, .{ .local = &self.local, .handle = js_value }, info, opts) catch |err| {handleError(T, @TypeOf(func), local, err, info, opts);- return 1;+ return js.Intercepted.no;};}-fn _setNamedIndex(comptime T: type, local: *const Local, func: anytype, name: *const v8.Name, js_value: js.Value, info: PropertyCallbackInfo, comptime opts: CallOpts) !u8 {+fn _setNamedIndex(comptime T: type, local: *const Local, func: anytype, name: *const v8.Name, js_value: js.Value, info: PropertyCallbackInfo, comptime opts: CallOpts) !u32 {const F = @TypeOf(func);var args: ParameterTypes(F) = undefined;@field(args, "0") = try TaggedOpaque.fromJS(*T, info.getThis());@@ -252,7 +252,7 @@ fn _setNamedIndex(comptime T: type, local: *const Local, func: anytype, name: *creturn handleIndexedReturn(T, F, false, local, ret, info, opts);}-pub fn deleteNamedIndex(self: *Caller, comptime T: type, func: anytype, name: *const v8.Name, handle: *const v8.PropertyCallbackInfo, comptime opts: CallOpts) u8 {+pub fn deleteNamedIndex(self: *Caller, comptime T: type, func: anytype, name: *const v8.Name, handle: *const v8.PropertyCallbackInfo, comptime opts: CallOpts) u32 {const local = &self.local;var hs: js.HandleScope = undefined;@@ -262,11 +262,11 @@ pub fn deleteNamedIndex(self: *Caller, comptime T: type, func: anytype, name: *cconst info = PropertyCallbackInfo{ .handle = handle };return _deleteNamedIndex(T, local, func, name, info, opts) catch |err| {handleError(T, @TypeOf(func), local, err, info, opts);- return 1;+ return js.Intercepted.no;};}-fn _deleteNamedIndex(comptime T: type, local: *const Local, func: anytype, name: *const v8.Name, info: PropertyCallbackInfo, comptime opts: CallOpts) !u8 {+fn _deleteNamedIndex(comptime T: type, local: *const Local, func: anytype, name: *const v8.Name, info: PropertyCallbackInfo, comptime opts: CallOpts) !u32 {const F = @TypeOf(func);var args: ParameterTypes(F) = undefined;@field(args, "0") = try TaggedOpaque.fromJS(*T, info.getThis());@@ -278,7 +278,7 @@ fn _deleteNamedIndex(comptime T: type, local: *const Local, func: anytype, name:return handleIndexedReturn(T, F, false, local, ret, info, opts);}-pub fn getEnumerator(self: *Caller, comptime T: type, func: anytype, handle: *const v8.PropertyCallbackInfo, comptime opts: CallOpts) u8 {+pub fn getEnumerator(self: *Caller, comptime T: type, func: anytype, handle: *const v8.PropertyCallbackInfo, comptime opts: CallOpts) u32 {const local = &self.local;var hs: js.HandleScope = undefined;@@ -288,11 +288,11 @@ pub fn getEnumerator(self: *Caller, comptime T: type, func: anytype, handle: *coconst info = PropertyCallbackInfo{ .handle = handle };return _getEnumerator(T, local, func, info, opts) catch |err| {handleError(T, @TypeOf(func), local, err, info, opts);- return 1;+ return js.Intercepted.no;};}-fn _getEnumerator(comptime T: type, local: *const Local, func: anytype, info: PropertyCallbackInfo, comptime opts: CallOpts) !u8 {+fn _getEnumerator(comptime T: type, local: *const Local, func: anytype, info: PropertyCallbackInfo, comptime opts: CallOpts) !u32 {const F = @TypeOf(func);var args: ParameterTypes(F) = undefined;@field(args, "0") = try TaggedOpaque.fromJS(*T, info.getThis());@@ -303,7 +303,7 @@ fn _getEnumerator(comptime T: type, local: *const Local, func: anytype, info: Prreturn handleIndexedReturn(T, F, true, local, ret, info, opts);}-fn handleIndexedReturn(comptime T: type, comptime F: type, comptime with_value: bool, local: *const Local, ret: anytype, info: PropertyCallbackInfo, comptime opts: CallOpts) !u8 {+fn handleIndexedReturn(comptime T: type, comptime F: type, comptime with_value: bool, local: *const Local, ret: anytype, info: PropertyCallbackInfo, comptime opts: CallOpts) !u32 {// need to unwrap this error immediately for when opts.null_as_undefined == true// and we need to compare it to null;const non_error_ret = switch (@typeInfo(@TypeOf(ret))) {@@ -314,11 +314,11 @@ fn handleIndexedReturn(comptime T: type, comptime F: type, comptime with_value:// if error.NotHandled is part of the error set.if (isInErrorSet(error.NotHandled, eu.error_set)) {if (err == error.NotHandled) {- return 1;+ return js.Intercepted.no;}}handleError(T, F, local, err, info, opts);- return 1;+ return js.Intercepted.no;};},else => ret,@@ -327,7 +327,7 @@ fn handleIndexedReturn(comptime T: type, comptime F: type, comptime with_value:if (comptime with_value) {info.getReturnValue().set(try local.zigValueToJs(non_error_ret, opts));}- return 0;+ return js.Intercepted.yes;}fn isInErrorSet(err: anyerror, comptime T: type) bool {diff --git a/src/browser/js/bridge.zig b/src/browser/js/bridge.zigindex 43db4ff34..6131f19b2 100644--- a/src/browser/js/bridge.zig+++ b/src/browser/js/bridge.zig@@ -259,8 +259,8 @@ pub const Accessor = struct {};pub const Indexed = struct {- getter: *const fn (idx: u32, handle: ?*const v8.PropertyCallbackInfo) callconv(.c) u8,- enumerator: ?*const fn (handle: ?*const v8.PropertyCallbackInfo) callconv(.c) u8,+ getter: *const fn (idx: u32, handle: ?*const v8.PropertyCallbackInfo) callconv(.c) u32,+ enumerator: ?*const fn (handle: ?*const v8.PropertyCallbackInfo) callconv(.c) u32,const Opts = struct {as_typed_array: bool = false,@@ -271,11 +271,11 @@ pub const Indexed = struct {var indexed = Indexed{.enumerator = null,.getter = struct {- fn wrap(idx: u32, handle: ?*const v8.PropertyCallbackInfo) callconv(.c) u8 {+ fn wrap(idx: u32, handle: ?*const v8.PropertyCallbackInfo) callconv(.c) u32 {const v8_isolate = v8.v8__PropertyCallbackInfo__GetIsolate(handle).?;var caller: Caller = undefined;if (!caller.init(v8_isolate)) {- return 1;+ return js.Intercepted.no;}defer caller.deinit();@@ -289,11 +289,11 @@ pub const Indexed = struct {if (@typeInfo(@TypeOf(enumerator)) != .null) {indexed.enumerator = struct {- fn wrap(handle: ?*const v8.PropertyCallbackInfo) callconv(.c) u8 {+ fn wrap(handle: ?*const v8.PropertyCallbackInfo) callconv(.c) u32 {const v8_isolate = v8.v8__PropertyCallbackInfo__GetIsolate(handle).?;var caller: Caller = undefined;if (!caller.init(v8_isolate)) {- return 1;+ return js.Intercepted.no;}defer caller.deinit();return caller.getEnumerator(T, enumerator, handle.?, .{});@@ -306,9 +306,9 @@ pub const Indexed = struct {};pub const NamedIndexed = struct {- getter: *const fn (c_name: ?*const v8.Name, handle: ?*const v8.PropertyCallbackInfo) callconv(.c) u8,- setter: ?*const fn (c_name: ?*const v8.Name, c_value: ?*const v8.Value, handle: ?*const v8.PropertyCallbackInfo) callconv(.c) u8 = null,- deleter: ?*const fn (c_name: ?*const v8.Name, handle: ?*const v8.PropertyCallbackInfo) callconv(.c) u8 = null,+ getter: *const fn (c_name: ?*const v8.Name, handle: ?*const v8.PropertyCallbackInfo) callconv(.c) u32,+ setter: ?*const fn (c_name: ?*const v8.Name, c_value: ?*const v8.Value, handle: ?*const v8.PropertyCallbackInfo) callconv(.c) u32 = null,+ deleter: ?*const fn (c_name: ?*const v8.Name, handle: ?*const v8.PropertyCallbackInfo) callconv(.c) u32 = null,const Opts = struct {as_typed_array: bool = false,@@ -321,11 +321,11 @@ pub const NamedIndexed = struct {fn init(comptime T: type, comptime getter: anytype, setter: anytype, deleter: anytype, comptime opts: Opts) NamedIndexed {const getter_fn = struct {- fn wrap(c_name: ?*const v8.Name, handle: ?*const v8.PropertyCallbackInfo) callconv(.c) u8 {+ fn wrap(c_name: ?*const v8.Name, handle: ?*const v8.PropertyCallbackInfo) callconv(.c) u32 {const v8_isolate = v8.v8__PropertyCallbackInfo__GetIsolate(handle).?;var caller: Caller = undefined;if (!caller.init(v8_isolate)) {- return 1;+ return js.Intercepted.no;}defer caller.deinit();@@ -337,11 +337,11 @@ pub const NamedIndexed = struct {}.wrap;const setter_fn = if (@typeInfo(@TypeOf(setter)) == .null) null else struct {- fn wrap(c_name: ?*const v8.Name, c_value: ?*const v8.Value, handle: ?*const v8.PropertyCallbackInfo) callconv(.c) u8 {+ fn wrap(c_name: ?*const v8.Name, c_value: ?*const v8.Value, handle: ?*const v8.PropertyCallbackInfo) callconv(.c) u32 {const v8_isolate = v8.v8__PropertyCallbackInfo__GetIsolate(handle).?;var caller: Caller = undefined;if (!caller.init(v8_isolate)) {- return 1;+ return js.Intercepted.no;}defer caller.deinit();@@ -365,11 +365,11 @@ pub const NamedIndexed = struct {}.wrap;const deleter_fn = if (@typeInfo(@TypeOf(deleter)) == .null) null else struct {- fn wrap(c_name: ?*const v8.Name, handle: ?*const v8.PropertyCallbackInfo) callconv(.c) u8 {+ fn wrap(c_name: ?*const v8.Name, handle: ?*const v8.PropertyCallbackInfo) callconv(.c) u32 {const v8_isolate = v8.v8__PropertyCallbackInfo__GetIsolate(handle).?;var caller: Caller = undefined;if (!caller.init(v8_isolate)) {- return 1;+ return js.Intercepted.no;}defer caller.deinit();@@ -480,14 +480,14 @@ pub const Property = struct {}};-pub fn unknownWindowPropertyCallback(c_name: ?*const v8.Name, handle: ?*const v8.PropertyCallbackInfo) callconv(.c) u8 {+pub fn unknownWindowPropertyCallback(c_name: ?*const v8.Name, handle: ?*const v8.PropertyCallbackInfo) callconv(.c) u32 {const v8_isolate = v8.v8__PropertyCallbackInfo__GetIsolate(handle).?;// During snapshot creation, there's no Context in embedder data yet.// I hate this check, but there doesn't seem to be a way to add this method// to the global, without triggering it during snapshot creation.- const v8_context = v8.v8__Isolate__GetCurrentContext(v8_isolate) orelse return 1;- const ctx: *Context = @ptrCast(@alignCast(v8.v8__Context__GetAlignedPointerFromEmbedderData(v8_context, 1) orelse return 1));+ const v8_context = v8.v8__Isolate__GetCurrentContext(v8_isolate) orelse return js.Intercepted.no;+ const ctx: *Context = @ptrCast(@alignCast(v8.v8__Context__GetAlignedPointerFromEmbedderData(v8_context, 1) orelse return js.Intercepted.no));var caller: Caller = undefined;caller.initWithContext(ctx, v8_context);@@ -500,7 +500,7 @@ pub fn unknownWindowPropertyCallback(c_name: ?*const v8.Name, handle: ?*const v8defer hs.deinit();const property: []const u8 = js.String.toSlice(.{ .local = local, .handle = @ptrCast(c_name.?) }) catch {- return 1;+ return js.Intercepted.no;};// Only Page contexts have document.getElementById lookup@@ -508,10 +508,10 @@ pub fn unknownWindowPropertyCallback(c_name: ?*const v8.Name, handle: ?*const v8.frame => |frame| {const document = frame.document;if (document.getElementById(property, frame)) |el| {- const js_val = local.zigValueToJs(el, .{}) catch return 1;+ const js_val = local.zigValueToJs(el, .{}) catch return js.Intercepted.no;var pc = Caller.PropertyCallbackInfo{ .handle = handle.? };pc.getReturnValue().set(js_val);- return 0;+ return js.Intercepted.yes;}},.worker => {}, // no global lookup in a worker@@ -521,7 +521,7 @@ pub fn unknownWindowPropertyCallback(c_name: ?*const v8.Name, handle: ?*const v8if (std.mem.startsWith(u8, property, "__")) {// some frameworks will extend built-in types using a __ prefix// these should always be safe to ignore.- return 1;+ return js.Intercepted.no;}const ignored = std.StaticStringMap(void).initComptime(.{@@ -553,27 +553,27 @@ pub fn unknownWindowPropertyCallback(c_name: ?*const v8.Name, handle: ?*const v8});if (!ignored.has(property)) {var buf: [2048]u8 = undefined;- const key = std.fmt.bufPrint(&buf, "Window:{s}", .{property}) catch return 1;- logUnknownProperty(local, key) catch return 1;+ const key = std.fmt.bufPrint(&buf, "Window:{s}", .{property}) catch return js.Intercepted.no;+ logUnknownProperty(local, key) catch return js.Intercepted.no;}}- return 1;+ return js.Intercepted.no;}// Only used for debugging-pub fn unknownObjectPropertyCallback(comptime JsApi: type) *const fn (?*const v8.Name, ?*const v8.PropertyCallbackInfo) callconv(.c) u8 {+pub fn unknownObjectPropertyCallback(comptime JsApi: type) *const fn (?*const v8.Name, ?*const v8.PropertyCallbackInfo) callconv(.c) u32 {if (comptime !IS_DEBUG) {@compileError("unknownObjectPropertyCallback should only be used in debug builds");}return struct {- fn wrap(c_name: ?*const v8.Name, handle: ?*const v8.PropertyCallbackInfo) callconv(.c) u8 {+ fn wrap(c_name: ?*const v8.Name, handle: ?*const v8.PropertyCallbackInfo) callconv(.c) u32 {const v8_isolate = v8.v8__PropertyCallbackInfo__GetIsolate(handle).?;var caller: Caller = undefined;if (!caller.init(v8_isolate)) {- return 1;+ return js.Intercepted.no;}defer caller.deinit();@@ -584,44 +584,44 @@ pub fn unknownObjectPropertyCallback(comptime JsApi: type) *const fn (?*const v8defer hs.deinit();const property: []const u8 = js.String.toSlice(.{ .local = local, .handle = @ptrCast(c_name.?) }) catch {- return 1;+ return js.Intercepted.no;};if (std.mem.startsWith(u8, property, "__")) {// some frameworks will extend built-in types using a __ prefix// these should always be safe to ignore.- return 1;+ return js.Intercepted.no;}if (std.mem.startsWith(u8, property, "jQuery")) {- return 1;+ return js.Intercepted.no;}if (JsApi == @import("../webapi/cdata/Text.zig").JsApi or JsApi == @import("../webapi/cdata/Comment.zig").JsApi) {if (std.mem.eql(u8, property, "tagName")) {// knockout does this, a lot.- return 1;+ return js.Intercepted.no;}}if (JsApi == @import("../webapi/element/Html.zig").JsApi or JsApi == @import("../webapi/Element.zig").JsApi or JsApi == @import("../webapi/element/html/Custom.zig").JsApi) {// react ?- if (std.mem.eql(u8, property, "props")) return 1;- if (std.mem.eql(u8, property, "hydrated")) return 1;- if (std.mem.eql(u8, property, "isHydrated")) return 1;+ if (std.mem.eql(u8, property, "props")) return js.Intercepted.no;+ if (std.mem.eql(u8, property, "hydrated")) return js.Intercepted.no;+ if (std.mem.eql(u8, property, "isHydrated")) return js.Intercepted.no;}if (JsApi == @import("../webapi/Console.zig").JsApi) {- if (std.mem.eql(u8, property, "firebug")) return 1;+ if (std.mem.eql(u8, property, "firebug")) return js.Intercepted.no;}const ignored = std.StaticStringMap(void).initComptime(.{});if (!ignored.has(property)) {var buf: [2048]u8 = undefined;- const key = std.fmt.bufPrint(&buf, "{s}:{s}", .{ if (@hasDecl(JsApi.Meta, "name")) JsApi.Meta.name else @typeName(JsApi), property }) catch return 1;- logUnknownProperty(local, key) catch return 1;+ const key = std.fmt.bufPrint(&buf, "{s}:{s}", .{ if (@hasDecl(JsApi.Meta, "name")) JsApi.Meta.name else @typeName(JsApi), property }) catch return js.Intercepted.no;+ logUnknownProperty(local, key) catch return js.Intercepted.no;}- return 1;+ return js.Intercepted.no;}}.wrap;}diff --git a/src/browser/js/js.zig b/src/browser/js/js.zigindex 3b1fa5950..3095d20b3 100644--- a/src/browser/js/js.zig+++ b/src/browser/js/js.zig@@ -21,6 +21,11 @@ const lp = @import("lightpanda");pub const v8 = @import("v8").c;+pub const Intercepted = struct {+ pub const yes: u32 = 0;+ pub const no: u32 = 1;+};+const string = @import("../../string.zig");pub const Env = @import("Env.zig");