cli: wording mode -> opts

Signed-off-by: Francis Bouvier <francis@lightpanda.io>
This commit is contained in:
Francis Bouvier
2024-11-27 21:23:33 +01:00
parent 8449d5ab22
commit 760c082757

View File

@@ -232,12 +232,12 @@ pub fn main() !void {
defer cli_mode.deinit(); defer cli_mode.deinit();
switch (cli_mode) { switch (cli_mode) {
.server => |mode| { .server => |opts| {
// Stream server // Stream server
const addr = blk: { const addr = blk: {
if (mode.tcp) { if (opts.tcp) {
break :blk mode.addr; break :blk opts.addr;
} else { } else {
const unix_path = "/tmp/lightpanda"; const unix_path = "/tmp/lightpanda";
std.fs.deleteFileAbsolute(unix_path) catch {}; // file could not exists std.fs.deleteFileAbsolute(unix_path) catch {}; // file could not exists
@@ -246,19 +246,19 @@ pub fn main() !void {
}; };
const socket = server.listen(addr) catch |err| { const socket = server.listen(addr) catch |err| {
log.err("Server listen error: {any}\n", .{err}); log.err("Server listen error: {any}\n", .{err});
return printUsageExit(mode.execname, 1); return printUsageExit(opts.execname, 1);
}; };
defer std.posix.close(socket); defer std.posix.close(socket);
log.debug("Server mode: listening internally on {any}...", .{addr}); log.debug("Server opts: listening internally on {any}...", .{addr});
const timeout = std.time.ns_per_s * @as(u64, mode.timeout); const timeout = std.time.ns_per_s * @as(u64, opts.timeout);
// loop // loop
var loop = try jsruntime.Loop.init(alloc); var loop = try jsruntime.Loop.init(alloc);
defer loop.deinit(); defer loop.deinit();
// TCP server mode // TCP server mode
if (mode.tcp) { if (opts.tcp) {
return server.handle(alloc, &loop, socket, null, timeout); return server.handle(alloc, &loop, socket, null, timeout);
} }
@@ -272,8 +272,8 @@ pub fn main() !void {
// Websocket server // Websocket server
var ws = try websocket.Server(handler.Handler).init(alloc, .{ var ws = try websocket.Server(handler.Handler).init(alloc, .{
.port = mode.port, .port = opts.port,
.address = mode.host, .address = opts.host,
.handshake = .{ .handshake = .{
.timeout = 3, .timeout = 3,
.max_size = 1024, .max_size = 1024,
@@ -288,8 +288,8 @@ pub fn main() !void {
cdp_thread.join(); cdp_thread.join();
}, },
.fetch => |mode| { .fetch => |opts| {
log.debug("Fetch mode: url {s}, dump {any}", .{ mode.url, mode.dump }); log.debug("Fetch mode: url {s}, dump {any}", .{ opts.url, opts.dump });
// vm // vm
const vm = jsruntime.VM.init(); const vm = jsruntime.VM.init();
@@ -307,21 +307,21 @@ pub fn main() !void {
// page // page
const page = try browser.session.createPage(); const page = try browser.session.createPage();
_ = page.navigate(mode.url, null) catch |err| switch (err) { _ = page.navigate(opts.url, null) catch |err| switch (err) {
error.UnsupportedUriScheme, error.UriMissingHost => { error.UnsupportedUriScheme, error.UriMissingHost => {
log.err("'{s}' is not a valid URL ({any})\n", .{ mode.url, err }); log.err("'{s}' is not a valid URL ({any})\n", .{ opts.url, err });
return printUsageExit(mode.execname, 1); return printUsageExit(opts.execname, 1);
}, },
else => { else => {
log.err("'{s}' fetching error ({any})s\n", .{ mode.url, err }); log.err("'{s}' fetching error ({any})s\n", .{ opts.url, err });
return printUsageExit(mode.execname, 1); return printUsageExit(opts.execname, 1);
}, },
}; };
try page.wait(); try page.wait();
// dump // dump
if (mode.dump) { if (opts.dump) {
try page.dump(std.io.getStdOut()); try page.dump(std.io.getStdOut());
} }
}, },