diff --git a/src/mcp/Server.zig b/src/mcp/Server.zig index ef51f30c..80da4b56 100644 --- a/src/mcp/Server.zig +++ b/src/mcp/Server.zig @@ -17,7 +17,6 @@ http_client: *HttpClient, notification: *lp.Notification, browser: lp.Browser, session: *lp.Session, -page: *lp.Page, writer: *std.io.Writer, mutex: std.Thread.Mutex = .{}, @@ -45,12 +44,8 @@ pub fn init(allocator: std.mem.Allocator, app: *App, writer: *std.io.Writer) !*S .http_client = http_client, .notification = notification, .session = undefined, - .page = undefined, }; - self.session = try self.browser.newSession(self.notification); - self.page = try self.session.createPage(); - return self; } diff --git a/src/mcp/protocol.zig b/src/mcp/protocol.zig index 5f5dc7f2..97035c0f 100644 --- a/src/mcp/protocol.zig +++ b/src/mcp/protocol.zig @@ -26,6 +26,7 @@ pub const ErrorCode = enum(i64) { MethodNotFound = -32601, InvalidParams = -32602, InternalError = -32603, + PageNotLoaded = -32604, }; pub const Notification = struct { diff --git a/src/mcp/resources.zig b/src/mcp/resources.zig index 7fd59dc3..dd6af972 100644 --- a/src/mcp/resources.zig +++ b/src/mcp/resources.zig @@ -37,7 +37,7 @@ const ResourceStreamingResult = struct { }, const StreamingText = struct { - server: *Server, + page: *lp.Page, format: enum { html, markdown }, pub fn jsonStringify(self: @This(), jw: *std.json.Stringify) !void { @@ -45,10 +45,10 @@ const ResourceStreamingResult = struct { try jw.writer.writeByte('"'); var escaped = protocol.JsonEscapingWriter.init(jw.writer); switch (self.format) { - .html => lp.dump.root(self.server.page.document, .{}, &escaped.writer, self.server.page) catch |err| { + .html => lp.dump.root(self.page.document, .{}, &escaped.writer, self.page) catch |err| { log.err(.mcp, "html dump failed", .{ .err = err }); }, - .markdown => lp.markdown.dump(self.server.page.document.asNode(), .{}, &escaped.writer, self.server.page) catch |err| { + .markdown => lp.markdown.dump(self.page.document.asNode(), .{}, &escaped.writer, self.page) catch |err| { log.err(.mcp, "markdown dump failed", .{ .err = err }); }, } @@ -69,16 +69,21 @@ const resource_map = std.StaticStringMap(ResourceUri).initComptime(.{ }); pub fn handleRead(server: *Server, arena: std.mem.Allocator, req: protocol.Request) !void { - if (req.params == null) { - return server.sendError(req.id.?, .InvalidParams, "Missing params"); + if (req.params == null or req.id == null) { + return server.sendError(req.id orelse .{ .integer = -1 }, .InvalidParams, "Missing params"); } + const req_id = req.id.?; const params = std.json.parseFromValueLeaky(ReadParams, arena, req.params.?, .{ .ignore_unknown_fields = true }) catch { - return server.sendError(req.id.?, .InvalidParams, "Invalid params"); + return server.sendError(req_id, .InvalidParams, "Invalid params"); }; const uri = resource_map.get(params.uri) orelse { - return server.sendError(req.id.?, .InvalidRequest, "Resource not found"); + return server.sendError(req_id, .InvalidRequest, "Resource not found"); + }; + + const page = server.session.currentPage() orelse { + return server.sendError(req_id, .PageNotLoaded, "Page not loaded"); }; switch (uri) { @@ -87,20 +92,20 @@ pub fn handleRead(server: *Server, arena: std.mem.Allocator, req: protocol.Reque .contents = &.{.{ .uri = params.uri, .mimeType = "text/html", - .text = .{ .server = server, .format = .html }, + .text = .{ .page = page, .format = .html }, }}, }; - try server.sendResult(req.id.?, result); + try server.sendResult(req_id, result); }, .@"mcp://page/markdown" => { const result: ResourceStreamingResult = .{ .contents = &.{.{ .uri = params.uri, .mimeType = "text/markdown", - .text = .{ .server = server, .format = .markdown }, + .text = .{ .page = page, .format = .markdown }, }}, }; - try server.sendResult(req.id.?, result); + try server.sendResult(req_id, result); }, } } diff --git a/src/mcp/tools.zig b/src/mcp/tools.zig index 146bd7db..6d990266 100644 --- a/src/mcp/tools.zig +++ b/src/mcp/tools.zig @@ -78,7 +78,7 @@ const EvaluateParams = struct { }; const ToolStreamingText = struct { - server: *Server, + page: *lp.Page, action: enum { markdown, links }, pub fn jsonStringify(self: @This(), jw: *std.json.Stringify) !void { @@ -87,16 +87,16 @@ const ToolStreamingText = struct { var escaped = protocol.JsonEscapingWriter.init(jw.writer); const w = &escaped.writer; switch (self.action) { - .markdown => lp.markdown.dump(self.server.page.document.asNode(), .{}, w, self.server.page) catch |err| { + .markdown => lp.markdown.dump(self.page.document.asNode(), .{}, w, self.page) catch |err| { log.err(.mcp, "markdown dump failed", .{ .err = err }); }, .links => { - if (Selector.querySelectorAll(self.server.page.document.asNode(), "a[href]", self.server.page)) |list| { - defer list.deinit(self.server.page); + if (Selector.querySelectorAll(self.page.document.asNode(), "a[href]", self.page)) |list| { + defer list.deinit(self.page); var first = true; for (list._nodes) |node| { if (node.is(Element.Html.Anchor)) |anchor| { - const href = anchor.getHref(self.server.page) catch |err| { + const href = anchor.getHref(self.page) catch |err| { log.err(.mcp, "resolve href failed", .{ .err = err }); continue; }; @@ -135,8 +135,8 @@ const tool_map = std.StaticStringMap(ToolAction).initComptime(.{ }); pub fn handleCall(server: *Server, arena: std.mem.Allocator, req: protocol.Request) !void { - if (req.params == null) { - return server.sendError(req.id.?, .InvalidParams, "Missing params"); + if (req.params == null or req.id == null) { + return server.sendError(req.id orelse .{ .integer = -1 }, .InvalidParams, "Missing params"); } const CallParams = struct { @@ -179,9 +179,12 @@ fn handleMarkdown(server: *Server, arena: std.mem.Allocator, id: std.json.Value, } } else |_| {} } + const page = server.session.currentPage() orelse { + return server.sendError(id, .PageNotLoaded, "Page not loaded"); + }; const content = [_]protocol.TextContent(ToolStreamingText){.{ - .text = .{ .server = server, .action = .markdown }, + .text = .{ .page = page, .action = .markdown }, }}; try server.sendResult(id, protocol.CallToolResult(ToolStreamingText){ .content = &content }); } @@ -197,9 +200,12 @@ fn handleLinks(server: *Server, arena: std.mem.Allocator, id: std.json.Value, ar } } else |_| {} } + const page = server.session.currentPage() orelse { + return server.sendError(id, .PageNotLoaded, "Page not loaded"); + }; const content = [_]protocol.TextContent(ToolStreamingText){.{ - .text = .{ .server = server, .action = .links }, + .text = .{ .page = page, .action = .links }, }}; try server.sendResult(id, protocol.CallToolResult(ToolStreamingText){ .content = &content }); } @@ -210,9 +216,12 @@ fn handleEvaluate(server: *Server, arena: std.mem.Allocator, id: std.json.Value, if (args.url) |url| { try performGoto(server, url, id); } + const page = server.session.currentPage() orelse { + return server.sendError(id, .PageNotLoaded, "Page not loaded"); + }; var ls: js.Local.Scope = undefined; - server.page.js.localScope(&ls); + page.js.localScope(&ls); defer ls.deinit(); var try_catch: js.TryCatch = undefined; @@ -247,7 +256,12 @@ fn parseArguments(comptime T: type, arena: std.mem.Allocator, arguments: ?std.js } fn performGoto(server: *Server, url: [:0]const u8, id: std.json.Value) !void { - _ = server.page.navigate(url, .{ + const session = server.session; + if (session.page != null) { + session.removePage(); + } + const page = try session.createPage(); + page.navigate(url, .{ .reason = .address_bar, .kind = .{ .push = null }, }) catch {