Skip to content

Lightpanda: the headless browser designed for AI and automation

fix: support sending websocket data on a small buffer

Karl Seguinc9bb82c968e7
diff --git a/src/browser/webapi/net/WebSocket.zig b/src/browser/webapi/net/WebSocket.zig
index aa594ad6d..1fa173428 100644
--- a/src/browser/webapi/net/WebSocket.zig
+++ b/src/browser/webapi/net/WebSocket.zig
@@ -803,7 +803,7 @@ fn sendDataCallback(buffer: [*]u8, buf_count: usize, buf_len: usize, data: *anyo
}
fn _sendDataCallback(conn: *http.Connection, buf: []u8) !usize {
- lp.assert(buf.len >= 2, "WS short buffer", .{ .len = buf.len });
+ lp.assert(buf.len > 0, "WS short buffer", .{ .len = buf.len });
const self = conn.transport.websocket;
@@ -820,22 +820,29 @@ fn _sendDataCallback(conn: *http.Connection, buf: []u8) !usize {
const reason = self._close_reason;
// Close frame: 2 bytes for code (big-endian) + optional reason
- // Truncate reason to fit in buf (max 123 bytes per spec)
- const reason_len: usize = @min(reason.len, 123, buf.len -| 2);
- const frame_len = 2 + reason_len;
- const to_copy = @min(buf.len, frame_len);
-
+ // (max 123 bytes per spec)
+ const reason_len: usize = @min(reason.len, 123);
var close_payload: [125]u8 = undefined;
close_payload[0] = @intCast((code >> 8) & 0xFF);
close_payload[1] = @intCast(code & 0xFF);
if (reason_len > 0) {
@memcpy(close_payload[2..][0..reason_len], reason[0..reason_len]);
}
+ const payload = close_payload[0 .. 2 + reason_len];
+
+ if (self._send_offset == 0) {
+ try conn.wsStartFrame(.close, payload.len);
+ }
- try conn.wsStartFrame(.close, to_copy);
- @memcpy(buf[0..to_copy], close_payload[0..to_copy]);
+ const remaining = payload[self._send_offset..];
+ const to_copy = @min(remaining.len, buf.len);
+ @memcpy(buf[0..to_copy], remaining[0..to_copy]);
- _ = self._send_queue.orderedRemove(0);
+ self._send_offset += to_copy;
+ if (self._send_offset == payload.len) {
+ _ = self._send_queue.orderedRemove(0);
+ self._send_offset = 0;
+ }
return to_copy;
},
.text => |content| return self.writeContent(conn, buf, content, .text),