add cookies to XHR requests

Author: karlseguin

src/browser/browser.zig

@@ -373,7 +373,7 @@ pub const Page = struct {
 
         var response = try request.sendSync(.{});
         const header = response.header;
-        try self.processHTTPResponse(self.uri, &header);
+        try self.session.cookie_jar.populateFromResponse(self.uri, &header);
 
         log.info("GET {any} {d}", .{ self.uri, header.status });
 
@@ -438,7 +438,9 @@ pub const Page = struct {
 
         // replace the user context document with the new one.
         try session.env.setUserContext(.{
+            .uri = self.uri,
             .document = html_doc,
+            .cookie_jar = @ptrCast(&self.session.cookie_jar),
             .http_client = @ptrCast(self.session.http_client),
         });
 
@@ -614,14 +616,14 @@ pub const Page = struct {
         const u = try std.Uri.resolve_inplace(self.uri, res_src, &b);
 
         var request = try self.newHTTPRequest(.GET, u, .{
-            .origin = self.uri,
+            .origin_uri = self.uri,
             .navigation = false,
         });
         defer request.deinit();
 
         var response = try request.sendSync(.{});
         var header = response.header;
-        try self.processHTTPResponse(u, &header);
+        try self.session.cookie_jar.populateFromResponse(u, &header);
 
         log.info("fetch {any}: {d}", .{ u, header.status });
 
@@ -650,46 +652,21 @@ pub const Page = struct {
         try s.eval(arena, &self.session.env, body);
     }
 
-    const RequestOpts = struct {
-        origin: ?std.Uri = null,
-        navigation: bool = true,
-    };
-    fn newHTTPRequest(self: *const Page, method: http.Request.Method, uri: std.Uri, opts: RequestOpts) !http.Request {
+    fn newHTTPRequest(self: *const Page, method: http.Request.Method, uri: std.Uri, opts: storage.cookie.LookupOpts) !http.Request {
         const session = self.session;
         var request = try session.http_client.request(method, uri);
         errdefer request.deinit();
 
-        var cookies = try session.cookie_jar.forRequest(
-            self.arena,
-            std.time.timestamp(),
-            opts.origin,
-            uri,
-            opts.navigation,
-        );
-        defer cookies.deinit(self.arena);
+        var arr: std.ArrayListUnmanaged(u8) = .{};
+        try session.cookie_jar.forRequest(uri, arr.writer(self.arena), opts);
 
-        if (cookies.len() > 0) {
-            var arr: std.ArrayListUnmanaged(u8) = .{};
-            try cookies.write(arr.writer(self.arena));
+        if (arr.items.len > 0) {
             try request.addHeader("Cookie", arr.items, .{});
         }
 
         return request;
     }
 
-    fn processHTTPResponse(self: *const Page, uri: std.Uri, header: *const http.ResponseHeader) !void {
-        const session = self.session;
-        const now = std.time.timestamp();
-        var it = header.iterate("set-cookie");
-        while (it.next()) |set_cookie| {
-            const c = storage.Cookie.parse(self.arena, uri, set_cookie) catch |err| {
-                log.warn("Couldn't parse cookie '{s}': {}\n", .{ set_cookie, err });
-                continue;
-            };
-            try session.cookie_jar.add(c, now);
-        }
-    }
-
     const Script = struct {
         element: *parser.Element,
         kind: Kind,

src/main_tests.zig

@@ -28,8 +28,7 @@ const apiweb = @import("apiweb.zig");
 const Window = @import("html/window.zig").Window;
 const xhr = @import("xhr/xhr.zig");
 const storage = @import("storage/storage.zig");
-const url = @import("url/url.zig");
-const URL = url.URL;
+const URL = @import("url/url.zig").URL;
 const urlquery = @import("url/query.zig");
 const Location = @import("html/location.zig").Location;
 
@@ -54,7 +53,7 @@ const EventTestExecFn = @import("events/event.zig").testExecFn;
 const XHRTestExecFn = xhr.testExecFn;
 const ProgressEventTestExecFn = @import("xhr/progress_event.zig").testExecFn;
 const StorageTestExecFn = storage.testExecFn;
-const URLTestExecFn = url.testExecFn;
+const URLTestExecFn = @import("url/url.zig").testExecFn;
 const HTMLElementTestExecFn = @import("html/elements.zig").testExecFn;
 const MutationObserverTestExecFn = @import("dom/mutation_observer.zig").testExecFn;
 
@@ -91,16 +90,23 @@ fn testExecFn(
     var http_client = try @import("http/client.zig").Client.init(alloc, 5);
     defer http_client.deinit();
 
+    // alias global as self and window
+    var window = Window.create(null, null);
+
+    const url = "https://lightpanda.io/opensource-browser/";
+    var u = try URL.constructor(alloc, url, null);
+    defer u.deinit(alloc);
+
+    var cookie_jar = storage.CookieJar.init(alloc);
+    defer cookie_jar.deinit();
+
     try js_env.setUserContext(.{
+        .uri = try std.Uri.parse(url),
         .document = doc,
+        .cookie_jar = &cookie_jar,
         .http_client = &http_client,
     });
 
-    // alias global as self and window
-    var window = Window.create(null, null);
-
-    var u = try URL.constructor(alloc, "https://lightpanda.io/opensource-browser/", null);
-    defer u.deinit(alloc);
     var location = Location{ .url = &u };
     try window.replaceLocation(&location);