mirrors/bun.sh
1
0
Fork 0
mirror of https://github.com/oven-sh/bun synced 2026-02-09 10:28:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add a helper for InlineBlob from two arrays

Browse Source
This commit is contained in:
Jarred Sumner
2022-10-15 21:03:40 -07:00
parent 40126bbe60
commit 63c9315b24
2 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/bun.js/api/server.zig
View File

@@ -2134,10 +2134,7 @@ fn NewRequestContext(comptime ssl_enabled: bool, comptime debug_mode: bool, comp
break :getter;
}
req.body = .{ .InlineBlob = JSC.WebCore.InlineBlob.init(bytes.items) };
var to_copy: []u8 = req.body.InlineBlob.bytes[bytes.items.len..];
@memcpy(to_copy.ptr, chunk.ptr, chunk.len);
req.body.InlineBlob.len += @truncate(JSC.WebCore.InlineBlob.IntSize, chunk.len);
req.body = .{ .InlineBlob = JSC.WebCore.InlineBlob.concat(bytes.items, chunk) };
this.request_body_buf.clearAndFree(this.allocator);
} else {
bytes.ensureTotalCapacityPrecise(this.allocator, total) catch |err| {

26
src/bun.js/webcore/response.zig
View File

@@ -4194,6 +4194,23 @@ pub const InlineBlob = extern struct {
len: IntSize align(1) = 0,
was_string: bool align(1) = false,
pub fn concat(first: []const u8, second: []const u8) InlineBlob {
const total = first.len + second.len;
std.debug.assert(total <= available_bytes);
var inline_blob: JSC.WebCore.InlineBlob = .{};
var bytes_slice = inline_blob.bytes[0..total];
if (first.len > 0)
@memcpy(bytes_slice.ptr, first.ptr, first.len);
if (second.len > 0)
@memcpy(bytes_slice.ptr + first.len, second.ptr, second.len);
inline_blob.len = @truncate(@TypeOf(inline_blob.len), total);
return inline_blob;
}
pub fn init(data: []const u8) InlineBlob {
std.debug.assert(data.len <= available_bytes);
@@ -4553,7 +4570,7 @@ pub const Body = struct {
pub const empty = Value{ .Empty = .{} };
pub fn toReadableStream(this: *Value, globalThis: *JSGlobalObject) JSValue {
JSC.markBinding();
JSC.markBinding(@src());
switch (this.*) {
.Used, .Empty => {
@@ -5548,8 +5565,7 @@ fn BodyMixin(comptime Type: type) type {
var value: *Body.Value = this.getBodyValue();
if (value.* == .Used) {
globalObject.throw("Body already used", .{});
return JSValue.jsUndefined();
return handleBodyAlreadyUsed(globalObject);
}
if (value.* == .Locked) {
@@ -5567,6 +5583,10 @@ fn BodyMixin(comptime Type: type) type {
) callconv(.C) JSC.JSValue {
var value: *Body.Value = this.getBodyValue();
if (value.* == .Used) {
return handleBodyAlreadyUsed(globalObject);
}
if (value.* == .Locked) {
return value.Locked.setPromise(globalObject, .getBlob);
}