mirrors/bun.sh
1
0
Fork 0
mirror of https://github.com/oven-sh/bun synced 2026-02-12 03:48:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

sendfile works

Browse Source
This commit is contained in:
Jarred Sumner
2022-03-21 21:31:47 -07:00
parent 7cd93e6670
commit b3bd413c3b
7 changed files with 174 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
Makefile
View File

@@ -94,13 +94,14 @@ ifeq ($(OS_NAME),linux)
LIBICONV_PATH =
endif
CFLAGS = $(MACOS_MIN_FLAG) $(MARCH_NATIVE) -ffunction-sections -fdata-sections -g -O3
OPTIMIZATION_LEVEL=-O3
CFLAGS = $(MACOS_MIN_FLAG) $(MARCH_NATIVE) -ffunction-sections -fdata-sections -g $(OPTIMIZATION_LEVEL)
BUN_TMP_DIR := /tmp/make-bun
BUN_DEPLOY_DIR = /tmp/bun-v$(PACKAGE_JSON_VERSION)/$(PACKAGE_NAME)
DEFAULT_USE_BMALLOC := 1
USE_BMALLOC ?= DEFAULT_USE_BMALLOC
JSC_BASE_DIR ?= ${HOME}/webkit-build
@@ -404,7 +405,7 @@ dev-wasm: dev-build-obj-wasm
emcc -sEXPORTED_FUNCTIONS="['_bun_free', '_cycleStart', '_cycleEnd', '_bun_malloc', '_scan', '_transform', '_init']" \
-g -s ERROR_ON_UNDEFINED_SYMBOLS=0 -DNDEBUG \
$(BUN_DEPS_DIR)/libmimalloc.a.wasm \
packages/debug-bun-freestanding-wasm32/bun-wasm.o -O3 --no-entry --allow-undefined -s ASSERTIONS=0 -s ALLOW_MEMORY_GROWTH=1 -s WASM_BIGINT=1 \
packages/debug-bun-freestanding-wasm32/bun-wasm.o $(OPTIMIZATION_LEVEL) --no-entry --allow-undefined -s ASSERTIONS=0 -s ALLOW_MEMORY_GROWTH=1 -s WASM_BIGINT=1 \
-o packages/debug-bun-freestanding-wasm32/bun-wasm.wasm
cp packages/debug-bun-freestanding-wasm32/bun-wasm.wasm src/api/demo/public/bun-wasm.wasm
@@ -413,7 +414,7 @@ build-obj-wasm:
emcc -sEXPORTED_FUNCTIONS="['_bun_free', '_cycleStart', '_cycleEnd', '_bun_malloc', '_scan', '_transform', '_init']" \
-g -s ERROR_ON_UNDEFINED_SYMBOLS=0 -DNDEBUG \
$(BUN_DEPS_DIR)/libmimalloc.a.wasm \
packages/bun-freestanding-wasm32/bun-wasm.o -O3 --no-entry --allow-undefined -s ASSERTIONS=0 -s ALLOW_MEMORY_GROWTH=1 -s WASM_BIGINT=1 \
packages/bun-freestanding-wasm32/bun-wasm.o $(OPTIMIZATION_LEVEL) --no-entry --allow-undefined -s ASSERTIONS=0 -s ALLOW_MEMORY_GROWTH=1 -s WASM_BIGINT=1 \
-o packages/bun-freestanding-wasm32/bun-wasm.wasm
cp packages/bun-freestanding-wasm32/bun-wasm.wasm src/api/demo/public/bun-wasm.wasm
@@ -437,12 +438,12 @@ UWS_LDFLAGS = -I$(BUN_DEPS_DIR)/boringssl/include
usockets:
rm -rf $(BUN_DEPS_DIR)/uws/uSockets/*.o $(BUN_DEPS_DIR)/uws/uSockets/*.a
cd $(BUN_DEPS_DIR)/uws/uSockets && \
$(CC) $(CFLAGS) $(UWS_CC_FLAGS) $(UWS_LDFLAGS) $(DEFAULT_LINKER_FLAGS) $(PLATFORM_LINKER_FLAGS) -O3 -g -c -c src/*.c src/eventing/*.c src/crypto/*.c -flto && \
$(CXX) $(CXXFLAGS) $(UWS_CXX_FLAGS) $(UWS_LDFLAGS) $(DEFAULT_LINKER_FLAGS) $(PLATFORM_LINKER_FLAGS) -O3 -g -c src/crypto/*.cpp && \
$(CC) $(CFLAGS) $(UWS_CC_FLAGS) $(UWS_LDFLAGS) $(DEFAULT_LINKER_FLAGS) $(PLATFORM_LINKER_FLAGS) $(OPTIMIZATION_LEVEL) -g -c -c src/*.c src/eventing/*.c src/crypto/*.c -flto && \
$(CXX) $(CXXFLAGS) $(UWS_CXX_FLAGS) $(UWS_LDFLAGS) $(DEFAULT_LINKER_FLAGS) $(PLATFORM_LINKER_FLAGS) $(OPTIMIZATION_LEVEL) -g -c src/crypto/*.cpp && \
ar rvs $(BUN_DEPS_OUT_DIR)/uSockets.a *.o
uws: usockets
$(CXX) -I$(BUN_DEPS_DIR)/uws/uSockets/src $(CLANG_FLAGS) $(UWS_CXX_FLAGS) $(UWS_LDFLAGS) -c -flto -I$(BUN_DEPS_DIR) $(BUN_DEPS_OUT_DIR)/uSockets.a $(BUN_DEPS_DIR)/libuwsockets.cpp -o $(BUN_DEPS_OUT_DIR)/libuwsockets.o
$(CXX) -I$(BUN_DEPS_DIR)/uws/uSockets/src $(CLANG_FLAGS) $(UWS_CXX_FLAGS) $(UWS_LDFLAGS) $(PLATFORM_LINKER_FLAGS) -c -flto -I$(BUN_DEPS_DIR) $(BUN_DEPS_OUT_DIR)/uSockets.a $(BUN_DEPS_DIR)/libuwsockets.cpp -o $(BUN_DEPS_OUT_DIR)/libuwsockets.o
@@ -504,12 +505,12 @@ generate-install-script:
fetch:
$(ZIG) build -Drelease-fast fetch-obj
$(CXX) $(PACKAGE_DIR)/fetch.o -g -O3 -o ./misctools/fetch $(DEFAULT_LINKER_FLAGS) -lc $(ARCHIVE_FILES)
$(CXX) $(PACKAGE_DIR)/fetch.o -g $(OPTIMIZATION_LEVEL) -o ./misctools/fetch $(DEFAULT_LINKER_FLAGS) -lc $(ARCHIVE_FILES)
rm -rf $(PACKAGE_DIR)/fetch.o
fetch-debug:
$(ZIG) build fetch-obj
$(CXX) $(DEBUG_PACKAGE_DIR)/fetch.o -g -O3 -o ./misctools/fetch $(DEFAULT_LINKER_FLAGS) -lc $(ARCHIVE_FILES)
$(CXX) $(DEBUG_PACKAGE_DIR)/fetch.o -g $(OPTIMIZATION_LEVEL) -o ./misctools/fetch $(DEFAULT_LINKER_FLAGS) -lc $(ARCHIVE_FILES)
httpbench-debug:
@@ -519,7 +520,7 @@ httpbench-debug:
httpbench-release:
$(ZIG) build -Drelease-fast httpbench-obj
$(CXX) $(PACKAGE_DIR)/httpbench.o -g -O3 -o ./misctools/http_bench $(DEFAULT_LINKER_FLAGS) -lc $(ARCHIVE_FILES)
$(CXX) $(PACKAGE_DIR)/httpbench.o -g $(OPTIMIZATION_LEVEL) -o ./misctools/http_bench $(DEFAULT_LINKER_FLAGS) -lc $(ARCHIVE_FILES)
rm -rf $(PACKAGE_DIR)/httpbench.o
@@ -961,7 +962,7 @@ bun-link-lld-release:
-o $(BUN_RELEASE_BIN) \
-W \
-flto \
-O3
$(OPTIMIZATION_LEVEL)
rm -rf $(BUN_RELEASE_BIN).dSYM
cp $(BUN_RELEASE_BIN) $(BUN_RELEASE_BIN)-profile
@@ -995,7 +996,7 @@ $(OBJ_DIR)/%.o: $(SRC_DIR)/%.cpp
$(CXX) -c -o $@ $< \
$(CLANG_FLAGS) \
$(MACOS_MIN_FLAG) \
-O3 \
$(OPTIMIZATION_LEVEL) \
-g \
-fno-exceptions \
-ffunction-sections -fdata-sections -g \
@@ -1007,7 +1008,7 @@ sizegen:
$(BUN_TMP_DIR)/sizegen > src/javascript/jsc/bindings/sizes.zig
picohttp:
$(CC) $(CFLAGS) -O3 -g -fPIC -c $(BUN_DEPS_DIR)/picohttpparser/picohttpparser.c -I$(BUN_DEPS_DIR) -o $(BUN_DEPS_OUT_DIR)/picohttpparser.o; cd ../../
$(CC) $(CFLAGS) $(OPTIMIZATION_LEVEL) -g -fPIC -c $(BUN_DEPS_DIR)/picohttpparser/picohttpparser.c -I$(BUN_DEPS_DIR) -o $(BUN_DEPS_OUT_DIR)/picohttpparser.o; cd ../../
analytics:
./node_modules/.bin/peechy --schema src/analytics/schema.peechy --zig src/analytics/analytics_schema.zig

31
integration/bunjs-only-snippets/response.file.test.js
View File

@@ -7,22 +7,39 @@ it("Response.file", async () => {
});
it("Response.file as a blob", async () => {
const file = path.join(import.meta.url, "../fetch.js.txt");
var response = Response.file(file);
const filePath = path.join(import.meta.url, "../fetch.js.txt");
const fixture = fs.readFileSync(filePath, "utf8");
// this is a Response object with the same interface as the one returned by fetch
// internally, instead of a byte array, it stores the file path!
// this enables several performance optimizations
var response = Response.file(filePath);
// at this point, it's still just a file path
var blob = await response.blob();
// no size because we haven't read it from disk yet
expect(blob.size).toBe(0);
expect(await blob.text()).toBe(fs.readFileSync(file, "utf8"));
expect(blob.size).toBe(1256);
expect(await blob.text()).toBe(fs.readFileSync(file, "utf8"));
// now it reads "./fetch.js.txt" from the filesystem
// it's lazy, only loads once we ask for it
// if it fails, the promise will reject at this point
expect(await blob.text()).toBe(fixture);
// now that it's loaded, the size updates
expect(blob.size).toBe(fixture.length);
// and it only loads once for _all_ blobs pointing to that file path
// until all references are released
expect((await blob.arrayBuffer()).byteLength).toBe(fixture.length);
const array = new Uint8Array(await blob.arrayBuffer());
const text = fs.readFileSync(file, "utf8");
const text = fixture;
for (let i = 0; i < text.length; i++) {
expect(array[i]).toBe(text.charCodeAt(i));
}
expect(blob.size).toBe(1256);
expect(blob.size).toBe(fixture.size);
blob = null;
response = null;
Bun.gc(true);
await new Promise((resolve) => setTimeout(resolve, 1));
// now we're back
var response = Response.file(file);
var blob = await response.blob();
expect(blob.size).toBe(0);
});

2
src/deps/_libusockets.h
View File

@@ -293,6 +293,8 @@ void uws_res_write_headers(int ssl, uws_res_t *res, const StringPointer *names,
void *uws_res_get_native_handle(int ssl, uws_res_t *res);
void uws_res_uncork(int ssl, uws_res_t *res);
void uws_res_set_write_offset(int ssl, uws_res_t *res, size_t off);
void us_socket_mark_needs_more_not_ssl(uws_res_t *res);
#ifdef __cplusplus
}
#endif

21
src/deps/libuwsockets.cpp
View File

@@ -1,6 +1,7 @@
#include "_libusockets.h"
#include <string_view>
#include <uws/src/App.h>
#include <uws/uSockets/src/internal/internal.h>
extern "C" {
@@ -794,9 +795,12 @@ void uws_res_write_header_int(int ssl, uws_res_t *res, const char *key,
void uws_res_end_without_body(int ssl, uws_res_t *res) {
if (ssl) {
uWS::HttpResponse<true> *uwsRes = (uWS::HttpResponse<true> *)res;
uwsRes->setWriteOffset(0);
uwsRes->endWithoutBody(0);
} else {
uWS::HttpResponse<false> *uwsRes = (uWS::HttpResponse<false> *)res;
uwsRes->setWriteOffset(0);
uwsRes->endWithoutBody(0);
}
}
@@ -1011,6 +1015,23 @@ void uws_res_uncork(int ssl, uws_res_t *res) {
// }
}
void us_socket_mark_needs_more_not_ssl(uws_res_t *res) {
us_socket_t *s = (us_socket_t *)res;
s->context->loop->data.last_write_failed = 1;
us_poll_change(&s->p, s->context->loop,
LIBUS_SOCKET_READABLE | LIBUS_SOCKET_WRITABLE);
}
void uws_res_set_write_offset(int ssl, uws_res_t *res, size_t off) {
if (ssl) {
uWS::HttpResponse<true> *uwsRes = (uWS::HttpResponse<true> *)res;
uwsRes->setWriteOffset(off);
} else {
uWS::HttpResponse<false> *uwsRes = (uWS::HttpResponse<false> *)res;
uwsRes->setWriteOffset(off);
}
}
void uws_res_cork(int ssl, uws_res_t *res, void *ctx,
void (*corker)(void *ctx)) {
if (ssl) {

2
src/deps/uws

Submodule src/deps/uws updated: 86367b9411...ccf3f9dd60

65
src/deps/uws.zig
View File

@@ -63,7 +63,7 @@ extern fn us_socket_context_free(ssl: c_int, context: ?*us_socket_context_t) voi
extern fn us_socket_context_on_open(ssl: c_int, context: ?*us_socket_context_t, on_open: ?fn (?*us_socket_t, c_int, [*c]u8, c_int) callconv(.C) ?*us_socket_t) void;
extern fn us_socket_context_on_close(ssl: c_int, context: ?*us_socket_context_t, on_close: ?fn (?*us_socket_t, c_int, ?*anyopaque) callconv(.C) ?*us_socket_t) void;
extern fn us_socket_context_on_data(ssl: c_int, context: ?*us_socket_context_t, on_data: ?fn (?*us_socket_t, [*c]u8, c_int) callconv(.C) ?*us_socket_t) void;
extern fn us_socket_context_on_writable(ssl: c_int, context: ?*us_socket_context_t, on_writable: ?fn (?*us_socket_t) callconv(.C) ?*us_socket_t) void;
extern fn us_socket_context_on_writable(ssl: c_int, context: ?*us_socket_context_t, on_writable: ?fn (*us_socket_t) callconv(.C) ?*us_socket_t) void;
extern fn us_socket_context_on_timeout(ssl: c_int, context: ?*us_socket_context_t, on_timeout: ?fn (?*us_socket_t) callconv(.C) ?*us_socket_t) void;
extern fn us_socket_context_on_connect_error(ssl: c_int, context: ?*us_socket_context_t, on_connect_error: ?fn (?*us_socket_t, c_int) callconv(.C) ?*us_socket_t) void;
extern fn us_socket_context_on_end(ssl: c_int, context: ?*us_socket_context_t, on_end: ?fn (?*us_socket_t) callconv(.C) ?*us_socket_t) void;
@@ -79,7 +79,7 @@ extern fn us_socket_context_adopt_socket(ssl: c_int, context: ?*us_socket_contex
extern fn us_create_child_socket_context(ssl: c_int, context: ?*us_socket_context_t, context_ext_size: c_int) ?*us_socket_context_t;
pub const Poll = opaque {
extern fn us_create_poll(loop: ?*Loop, fallthrough: c_int, ext_size: c_uint) ?*Poll;
extern fn us_create_poll(loop: ?*Loop, fallthrough: c_int, ext_size: c_uint) *Poll;
extern fn us_poll_free(p: ?*Poll, loop: ?*Loop) void;
extern fn us_poll_init(p: ?*Poll, fd: c_int, poll_type: c_int) void;
extern fn us_poll_start(p: ?*Poll, loop: ?*Loop, events: c_int) void;
@@ -410,6 +410,7 @@ pub fn NewApp(comptime ssl: bool) type {
pub fn end(res: *Response, data: []const u8, close_connection: bool) void {
uws_res_end(ssl_flag, res.downcast(), data.ptr, data.len, close_connection);
}
pub fn uncork(_: *Response) void {
// uws_res_uncork(
// ssl_flag,
@@ -443,6 +444,9 @@ pub fn NewApp(comptime ssl: bool) type {
pub fn getWriteOffset(res: *Response) uintmax_t {
return uws_res_get_write_offset(ssl_flag, res.downcast());
}
pub fn setWriteOffset(res: *Response, offset: anytype) void {
uws_res_set_write_offset(ssl_flag, res.downcast(), @intCast(uintmax_t, offset));
}
pub fn hasResponded(res: *Response) bool {
return uws_res_has_responded(ssl_flag, res.downcast());
}
@@ -470,6 +474,9 @@ pub fn NewApp(comptime ssl: bool) type {
}
};
uws_res_on_writable(ssl_flag, res.downcast(), Wrapper.handle, user_data);
if (!ssl) {
us_socket_mark_needs_more_not_ssl(res.downcast());
}
}
pub fn onAborted(res: *Response, comptime UserDataType: type, comptime handler: fn (UserDataType, *Response) void, opcional_data: UserDataType) void {
const Wrapper = struct {
@@ -536,6 +543,57 @@ pub fn NewApp(comptime ssl: bool) type {
uws_res_cork(ssl_flag, res.downcast(), opcional_data, Wrapper.handle);
}
// pub fn onSocketWritable(
// res: *Response,
// comptime UserDataType: type,
// comptime handler: fn (UserDataType, fd: i32) void,
// opcional_data: UserDataType,
// ) void {
// const Wrapper = struct {
// pub fn handle(user_data: ?*anyopaque, fd: i32) callconv(.C) void {
// if (comptime UserDataType == void) {
// @call(.{ .modifier = .always_inline }, handler, .{
// void{},
// fd,
// });
// } else {
// @call(.{ .modifier = .always_inline }, handler, .{
// @ptrCast(
// UserDataType,
// @alignCast(@alignOf(UserDataType), user_data.?),
// ),
// fd,
// });
// }
// }
// };
// const OnWritable = struct {
// pub fn handle(socket: *us_socket_t) callconv(.C) ?*us_socket_t {
// if (comptime UserDataType == void) {
// @call(.{ .modifier = .always_inline }, handler, .{
// void{},
// fd,
// });
// } else {
// @call(.{ .modifier = .always_inline }, handler, .{
// @ptrCast(
// UserDataType,
// @alignCast(@alignOf(UserDataType), user_data.?),
// ),
// fd,
// });
// }
// return socket;
// }
// };
// var socket_ctx = us_socket_context(ssl_flag, uws_res_get_native_handle(ssl_flag, res)).?;
// var child = us_create_child_socket_context(ssl_flag, socket_ctx, 8);
// }
pub fn writeHeaders(
res: *Response,
names: []const Api.StringPointer,
@@ -605,6 +663,7 @@ extern fn uws_res_write_header_int(ssl: c_int, res: *uws_res, key: [*c]const u8,
extern fn uws_res_end_without_body(ssl: c_int, res: *uws_res) void;
extern fn uws_res_write(ssl: c_int, res: *uws_res, data: [*c]const u8, length: usize) bool;
extern fn uws_res_get_write_offset(ssl: c_int, res: *uws_res) uintmax_t;
extern fn uws_res_set_write_offset(ssl: c_int, res: *uws_res, uintmax_t) void;
extern fn uws_res_has_responded(ssl: c_int, res: *uws_res) bool;
extern fn uws_res_on_writable(ssl: c_int, res: *uws_res, handler: ?fn (*uws_res, uintmax_t, ?*anyopaque) callconv(.C) bool, user_data: ?*anyopaque) void;
extern fn uws_res_on_aborted(ssl: c_int, res: *uws_res, handler: ?fn (*uws_res, ?*anyopaque) callconv(.C) void, opcional_data: ?*anyopaque) void;
@@ -673,3 +732,5 @@ pub const uws_app_listen_config_t = extern struct {
host: [*c]const u8 = null,
options: c_int,
};
extern fn us_socket_mark_needs_more_not_ssl(socket: ?*uws_res) void;

88
src/javascript/jsc/api/server.zig
View File

@@ -81,8 +81,10 @@ const uws = @import("uws");
const SendfileContext = struct {
fd: i32,
socket_fd: i32 = 0,
remain: u32 = 0,
offset: i64 = 0,
has_listener: bool = false,
};
pub fn NewServer(comptime ssl_enabled: bool) type {
@@ -262,62 +264,84 @@ pub fn NewServer(comptime ssl_enabled: bool) type {
this.sendfile = undefined;
this.finalize();
}
const separator: string = "\r\n";
const separator_iovec = [1]std.os.iovec_const{.{
.iov_base = separator.ptr,
.iov_len = separator.len,
}};
pub fn onSendfile(this: *RequestContext, amount_: c_ulong, response: *App.Response) callconv(.C) bool {
const amount = @minimum(@truncate(u32, amount_), this.sendfile.remain);
if (amount == 0 or this.aborted) {
this.cleanupAfterSendfile();
return true;
}
const adjusted_count_temporary = @minimum(amount, @as(u63, std.math.maxInt(i32)));
pub fn onSendfile(this: *RequestContext) bool {
const adjusted_count_temporary = @minimum(@as(u63, this.sendfile.remain), @as(u63, std.math.maxInt(i32)));
// TODO we should not need this int cast; improve the return type of `@minimum`
const adjusted_count = @intCast(u63, adjusted_count_temporary);
var sbytes: std.os.off_t = adjusted_count;
const signed_offset = @bitCast(i64, this.sendfile.offset);
if (Environment.isLinux) {
const sent = @truncate(
u32,
std.os.linux.sendfile(response.getNativeHandle(), this.sendfile.fd, &this.sendfile.offset, amount),
);
const start = this.sendfile.offset;
const val =
std.os.linux.sendfile(this.sendfile.socket_fd, this.sendfile.fd, &this.sendfile.offset, this.sendfile.adjusted_count);
const sent = @intCast(u32, this.sendfile.offset - start);
const errcode = std.os.linux.getErrno(val);
this.sendfile.offset += sent;
this.sendfile.remain -= sent;
if (sent == 0 or this.aborted or this.sendfile.remain == 0) {
if (errcode != .AGAIN or this.aborted or this.sendfile.remain == 0 or val == 0) {
if (errcode != .AGAIN and errcode != .SUCCESS) {
Output.prettyErrorln("Error: {s}", .{@tagName(errcode)});
Output.flush();
}
this.cleanupAfterSendfile();
return false;
return errcode != .SUCCESS;
}
} else {
// var sf_hdr_trailer: std.os.darwin.sf_hdtr = .{
// .headers = &separator_iovec,
// .hdr_cnt = 1,
// .trailers = undefined,
// .trl_cnt = 0,
// };
// const headers = if (this.sendfile.offset == 0)
// &sf_hdr_trailer
// else
// null;
const errcode = std.c.getErrno(std.c.sendfile(
this.sendfile.fd,
response.getNativeHandle(),
this.sendfile.socket_fd,
signed_offset,
&sbytes,
null,
0,
));
this.sendfile.offset += sbytes;
this.sendfile.remain -= if (errcode != .SUCCESS) @intCast(u32, sbytes) else 0;
if ((errcode != .AGAIN and errcode != .SUCCESS) or this.aborted or this.sendfile.remain == 0) {
this.sendfile.remain -= @intCast(u32, sbytes);
if (errcode != .AGAIN or this.aborted or this.sendfile.remain == 0 or sbytes == 0) {
if (errcode != .AGAIN and errcode != .SUCCESS) {
Output.prettyErrorln("Error: {s}", .{@tagName(errcode)});
Output.flush();
}
this.cleanupAfterSendfile();
return false;
return errcode != .SUCCESS;
}
}
this.resp.onWritable(*RequestContext, onSendfile, this);
this.resp.setWriteOffset(this.sendfile.offset);
this.resp.onWritable(*RequestContext, onWritableSendfile, this);
return true;
}
pub fn onWritableSendfile(this: *RequestContext, _: c_ulong, _: *App.Response) callconv(.C) bool {
return this.onSendfile();
}
pub fn onWritablePrepareSendfile(this: *RequestContext, _: c_ulong, _: *App.Response) callconv(.C) bool {
this.renderSendFile(this.blob);
return true;
}
@@ -349,7 +373,8 @@ pub fn NewServer(comptime ssl_enabled: bool) type {
this.sendfile = .{
.fd = fd,
.remain = size_,
.remain = size_, // 2 is for \r\n,
.socket_fd = this.resp.getNativeHandle(),
};
if (size_ == 0) {
@@ -358,24 +383,10 @@ pub fn NewServer(comptime ssl_enabled: bool) type {
return;
}
{
const wrote = std.os.write(
this.resp.getNativeHandle(),
"\r\n",
) catch {
this.cleanupAfterSendfile();
return;
};
if (wrote == 0) {
this.cleanupAfterSendfile();
return;
}
}
// if we're not immediately writable, go ahead and try
if (this.sendfile.remain == size_) {
_ = this.onSendfile(size_, this.resp);
}
_ = std.os.write(this.sendfile.socket_fd, "\r\n") catch 0;
_ = this.onSendfile();
}
pub fn renderSendFile(this: *RequestContext, blob: JSC.WebCore.Blob) void {
@@ -413,7 +424,6 @@ pub fn NewServer(comptime ssl_enabled: bool) type {
this.blob = response.body.use();
this.req.setYield(false);
this.setAbortHandler();
this.resp.onWritable(*RequestContext, onWritablePrepareSendfile, this);
if (!this.has_sendfile_ctx) this.renderSendFile(this.blob);
return;
}