mirror of
https://github.com/lightpanda-io/browser.git
synced 2026-03-22 04:34:44 +00:00
Rework CDP frameIds (and loaderIds and requestIds and interceptorIds)
Our BrowsingContext currently supports 1 target. So we have a per-BC target_id. Previously, our target had 1 "frame" - our page. So we often treated the targetId as the frameId. But to work with frames, we need page-specific frameIds and loaderIds. This tries to clean up our ids (a little). frameIds are now ids derived from a new incrementing page.id. This page.id has to be passed around (via http Requests and through notifications) in order to properly generate messages with a frameId.
This commit is contained in:
96
src/id.zig
96
src/id.zig
@@ -19,72 +19,6 @@
|
||||
const std = @import("std");
|
||||
const lp = @import("lightpanda");
|
||||
|
||||
// Generates incrementing prefixed integers, i.e. CTX-1, CTX-2, CTX-3.
|
||||
// Wraps to 0 on overflow.
|
||||
// Many caveats for using this:
|
||||
// - Not thread-safe.
|
||||
// - Information leaking
|
||||
// - The slice returned by next() is only valid:
|
||||
// - while incrementor is valid
|
||||
// - until the next call to next()
|
||||
// On the positive, it's zero allocation
|
||||
pub fn Incrementing(comptime T: type, comptime prefix: []const u8) type {
|
||||
// +1 for the '-' separator
|
||||
const NUMERIC_START = prefix.len + 1;
|
||||
const MAX_BYTES = NUMERIC_START + switch (T) {
|
||||
u8 => 3,
|
||||
u16 => 5,
|
||||
u32 => 10,
|
||||
u64 => 20,
|
||||
else => @compileError("Incrementing must be given an unsigned int type, got: " ++ @typeName(T)),
|
||||
};
|
||||
|
||||
const buffer = blk: {
|
||||
var b = [_]u8{0} ** MAX_BYTES;
|
||||
@memcpy(b[0..prefix.len], prefix);
|
||||
b[prefix.len] = '-';
|
||||
break :blk b;
|
||||
};
|
||||
|
||||
const PrefixIntType = @Type(.{ .int = .{
|
||||
.bits = NUMERIC_START * 8,
|
||||
.signedness = .unsigned,
|
||||
} });
|
||||
|
||||
const PREFIX_INT_CODE: PrefixIntType = @bitCast(buffer[0..NUMERIC_START].*);
|
||||
|
||||
return struct {
|
||||
counter: T = 0,
|
||||
buffer: [MAX_BYTES]u8 = buffer,
|
||||
|
||||
const Self = @This();
|
||||
|
||||
pub fn next(self: *Self) []const u8 {
|
||||
const counter = self.counter;
|
||||
const n = counter +% 1;
|
||||
defer self.counter = n;
|
||||
|
||||
const size = std.fmt.printInt(self.buffer[NUMERIC_START..], n, 10, .lower, .{});
|
||||
return self.buffer[0 .. NUMERIC_START + size];
|
||||
}
|
||||
|
||||
// extracts the numeric portion from an ID
|
||||
pub fn parse(str: []const u8) !T {
|
||||
if (str.len <= NUMERIC_START) {
|
||||
return error.InvalidId;
|
||||
}
|
||||
|
||||
if (@as(PrefixIntType, @bitCast(str[0..NUMERIC_START].*)) != PREFIX_INT_CODE) {
|
||||
return error.InvalidId;
|
||||
}
|
||||
|
||||
return std.fmt.parseInt(T, str[NUMERIC_START..], 10) catch {
|
||||
return error.InvalidId;
|
||||
};
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
pub fn uuidv4(hex: []u8) void {
|
||||
lp.assert(hex.len == 36, "uuidv4.len", .{ .len = hex.len });
|
||||
|
||||
@@ -108,36 +42,6 @@ pub fn uuidv4(hex: []u8) void {
|
||||
}
|
||||
|
||||
const testing = std.testing;
|
||||
test "id: Incrementing.next" {
|
||||
var id = Incrementing(u16, "IDX"){};
|
||||
try testing.expectEqualStrings("IDX-1", id.next());
|
||||
try testing.expectEqualStrings("IDX-2", id.next());
|
||||
try testing.expectEqualStrings("IDX-3", id.next());
|
||||
|
||||
// force a wrap
|
||||
id.counter = 65533;
|
||||
try testing.expectEqualStrings("IDX-65534", id.next());
|
||||
try testing.expectEqualStrings("IDX-65535", id.next());
|
||||
try testing.expectEqualStrings("IDX-0", id.next());
|
||||
}
|
||||
|
||||
test "id: Incrementing.parse" {
|
||||
const ReqId = Incrementing(u32, "REQ");
|
||||
try testing.expectError(error.InvalidId, ReqId.parse(""));
|
||||
try testing.expectError(error.InvalidId, ReqId.parse("R"));
|
||||
try testing.expectError(error.InvalidId, ReqId.parse("RE"));
|
||||
try testing.expectError(error.InvalidId, ReqId.parse("REQ"));
|
||||
try testing.expectError(error.InvalidId, ReqId.parse("REQ-"));
|
||||
try testing.expectError(error.InvalidId, ReqId.parse("REQ--1"));
|
||||
try testing.expectError(error.InvalidId, ReqId.parse("REQ--"));
|
||||
try testing.expectError(error.InvalidId, ReqId.parse("REQ-Nope"));
|
||||
try testing.expectError(error.InvalidId, ReqId.parse("REQ-4294967296"));
|
||||
|
||||
try testing.expectEqual(0, try ReqId.parse("REQ-0"));
|
||||
try testing.expectEqual(99, try ReqId.parse("REQ-99"));
|
||||
try testing.expectEqual(4294967295, try ReqId.parse("REQ-4294967295"));
|
||||
}
|
||||
|
||||
test "id: uuiv4" {
|
||||
const expectUUID = struct {
|
||||
fn expect(uuid: [36]u8) !void {
|
||||
|
||||
Reference in New Issue
Block a user