zambyte/zaprus
1
0
Fork 0
mirror of https://git.robbyzambito.me/zaprus synced 2026-02-04 08:24:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Kill process after 10 messages or 3 seconds

Browse Source
This commit is contained in:
Robby Zambito
2026-01-24 21:31:33 -05:00
parent 19c2b78d1d
commit f554e7a3bb
2 changed files with 48 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.zig.zon
View File

@@ -10,7 +10,7 @@
// This is a [Semantic Version](https://semver.org/). // This is a [Semantic Version](https://semver.org/).
// In a future version of Zig it will be used for package deduplication. // In a future version of Zig it will be used for package deduplication.
.version = "0.0.0", .version = "0.1.0",
// Together with name, this represents a globally unique package // Together with name, this represents a globally unique package
// identifier. This field is generated by the Zig toolchain when the // identifier. This field is generated by the Zig toolchain when the

61
src/main.zig
View File

@@ -157,35 +157,59 @@ pub fn main(init: std.process.Init) !void {
continue; continue;
}; };
const child = std.process.spawn(init.io, .{ var child = std.process.spawn(init.io, .{
.argv = &.{ "bash", "-c", connection_payload }, .argv = &.{ "bash", "-c", connection_payload },
.stdout = .pipe, .stdout = .pipe,
.stderr = .pipe, .stderr = .ignore,
.stdin = .ignore,
}) catch continue; }) catch continue;
var child_stdout: std.ArrayList(u8) = .empty; var child_output_buf: [SaprusClient.max_payload_len]u8 = undefined;
defer child_stdout.deinit(init.gpa); var child_output_reader = child.stdout.?.reader(init.io, &child_output_buf);
var child_stderr: std.ArrayList(u8) = .empty;
defer child_stderr.deinit(init.gpa);
child.collectOutput(init.gpa, &child_stdout, &child_stderr, std.math.maxInt(usize)) catch |err| { var is_killed: std.atomic.Value(bool) = .init(false);
log.debug("Failed to collect output: {t}", .{err});
continue; var kill_task = try init.io.concurrent(killProcessAfter, .{ init.io, &child, .fromSeconds(3), &is_killed });
}; defer _ = kill_task.cancel(init.io) catch {};
var cmd_output_buf: [SaprusClient.max_payload_len * 2]u8 = undefined; var cmd_output_buf: [SaprusClient.max_payload_len * 2]u8 = undefined;
var cmd_output: Writer = .fixed(&cmd_output_buf); var cmd_output: Writer = .fixed(&cmd_output_buf);
var cmd_output_window_iter = std.mem.window(u8, child_stdout.items, SaprusClient.max_payload_len, SaprusClient.max_payload_len); // Maximum of 10 messages of output per command
while (cmd_output_window_iter.next()) |chunk| { for (0..10) |_| {
cmd_output.end = 0; cmd_output.end = 0;
// Unreachable because the cmd_output_buf is twice the size of the chunk.
cmd_output.print("{b64}", .{chunk}) catch unreachable; child_output_reader.interface.fill(child_output_reader.interface.buffer.len) catch |err| switch (err) {
error.ReadFailed => continue :next_message, // TODO: check if there is a better way to handle this
error.EndOfStream => {
cmd_output.print("{b64}", .{child_output_reader.interface.buffered()}) catch unreachable;
if (cmd_output.end > 0) {
connection.send(init.io, cmd_output.buffered()) catch |e| {
log.debug("Failed to send connection chunk: {t}", .{e});
continue :next_message;
};
}
break;
},
};
cmd_output.print("{b64}", .{try child_output_reader.interface.takeArray(child_output_buf.len)}) catch unreachable;
connection.send(init.io, cmd_output.buffered()) catch |err| { connection.send(init.io, cmd_output.buffered()) catch |err| {
log.debug("Failed to send connection chunk: {t}", .{err}); log.debug("Failed to send connection chunk: {t}", .{err});
continue :next_message; continue :next_message;
}; };
try init.io.sleep(.fromMilliseconds(40), .boot); try init.io.sleep(.fromMilliseconds(40), .boot);
} else {
kill_task.cancel(init.io) catch {};
killProcessAfter(init.io, &child, .zero, &is_killed) catch |err| {
log.debug("Failed to kill process??? {t}", .{err});
continue :next_message;
};
}
if (!is_killed.load(.monotonic)) {
_ = child.wait(init.io) catch |err| {
log.debug("Failed to wait for child: {t}", .{err});
};
} }
} }
} }
@@ -194,6 +218,15 @@ pub fn main(init: std.process.Init) !void {
unreachable; unreachable;
} }
fn killProcessAfter(io: std.Io, proc: *std.process.Child, duration: std.Io.Duration, is_killed: *std.atomic.Value(bool)) !void {
io.sleep(duration, .boot) catch |err| switch (err) {
error.Canceled => return,
else => |e| return e,
};
is_killed.store(true, .monotonic);
proc.kill(io);
}
fn parseDest(in: ?[]const u8) [4]u8 { fn parseDest(in: ?[]const u8) [4]u8 {
if (in) |dest| { if (in) |dest| {
if (dest.len <= 4) { if (dest.len <= 4) {