Add FileRoute for serving files

cmake/sources/ZigSources.txt

@@ -56,6 +56,7 @@ src/bun.js/api/JSBundler.zig
 src/bun.js/api/JSTranspiler.zig
 src/bun.js/api/server.zig
 src/bun.js/api/server/AnyRequestContext.zig
+src/bun.js/api/server/FileRoute.zig
 src/bun.js/api/server/HTMLBundle.zig
 src/bun.js/api/server/HTTPStatusText.zig
 src/bun.js/api/server/InspectorBunFrontendDevServerAgent.zig
@@ -473,6 +474,7 @@ src/fd.zig
 src/feature_flags.zig
 src/fmt.zig
 src/fs.zig
+src/fs/stat_hash.zig
 src/futex.zig
 src/generated_perf_trace_events.zig
 src/generated_versions_list.zig

packages/bun-uws/src/AsyncSocket.h

@@ -260,7 +260,7 @@ struct AsyncSocket {
                 * since written < buffer_len is very likely to be true
                 */
                 if(written < max_flush_len) {
-                     [[likely]]
+                    [[likely]]
                     /* Cannot write more at this time, return what we've written so far */
                     return total_written;
                 }

packages/bun-uws/src/HttpContext.h

@@ -456,10 +456,9 @@ struct HttpContext {
             size_t bufferedAmount = asyncSocket->getBufferedAmount();
             if (bufferedAmount > 0) {
                 /* Try to flush pending data from the socket's buffer to the network */
-                bufferedAmount -= asyncSocket->flush();
-
+                asyncSocket->flush();
                 /* Check if there's still data waiting to be sent after flush attempt */
-                if (bufferedAmount > 0) {
+                if (asyncSocket->getBufferedAmount() > 0) {
                     /* Socket buffer is not completely empty yet
                     * - Reset the timeout to prevent premature connection closure
                     * - This allows time for another writable event or new request
@@ -498,6 +497,7 @@ struct HttpContext {
             if (httpResponseData->state & HttpResponseData<SSL>::HTTP_CONNECTION_CLOSE) {
                 if ((httpResponseData->state & HttpResponseData<SSL>::HTTP_RESPONSE_PENDING) == 0) {
                     if (asyncSocket->getBufferedAmount() == 0) {
+
                         asyncSocket->shutdown();
                         /* We need to force close after sending FIN since we want to hinder
                          * clients from keeping to send their huge data */

packages/bun-uws/src/HttpResponse.h

@@ -112,7 +112,7 @@ struct HttpResponse : public AsyncSocket<SSL> {
                 * one party must tell the other one so.
                 *
                 * This check also serves to limit writing the header only once. */
-                if ((httpResponseData->state & HttpResponseData<SSL>::HTTP_CONNECTION_CLOSE) == 0) {
+                if ((httpResponseData->state & HttpResponseData<SSL>::HTTP_CONNECTION_CLOSE) == 0 && !(httpResponseData->state & (HttpResponseData<SSL>::HTTP_WRITE_CALLED))) {
                     writeHeader("Connection", "close");
                 }
 
@@ -132,7 +132,6 @@ struct HttpResponse : public AsyncSocket<SSL> {
 
             /* Terminating 0 chunk */
             Super::write("0\r\n\r\n", 5);
-
             httpResponseData->markDone();
 
             /* We need to check if we should close this socket here now */
@@ -586,7 +585,6 @@ struct HttpResponse : public AsyncSocket<SSL> {
         if (writtenPtr) {
             *writtenPtr = total_written;
         }
-
         /* If we did not fail the write, accept more */
         return !has_failed;
     }

packages/bun-uws/src/LoopData.h

@@ -118,7 +118,6 @@ struct alignas(16) LoopData {
         time_t now = time(0);
         struct tm tstruct = {};
 #ifdef _WIN32
-        /* Micro, fucking soft never follows spec. */
         gmtime_s(&tstruct, &now);
 #else
         gmtime_r(&now, &tstruct);

src/bun.js/api/server.zig

@@ -61,13 +61,16 @@ pub fn writeStatus(comptime ssl: bool, resp_ptr: ?*uws.NewApp(ssl).Response, sta
 
 // TODO: rename to StaticBlobRoute? the html bundle is sometimes a static route
 pub const StaticRoute = @import("./server/StaticRoute.zig");
+pub const FileRoute = @import("./server/FileRoute.zig");
 
 const HTMLBundle = JSC.API.HTMLBundle;
 
 pub const AnyRoute = union(enum) {
     /// Serve a static file
     /// "/robots.txt": new Response(...),
     static: *StaticRoute,
+    /// Serve a file from disk
+    file: *FileRoute,
     /// Bundle an HTML import
     /// import html from "./index.html";
     /// "/": html,
@@ -82,6 +85,7 @@ pub const AnyRoute = union(enum) {
     pub fn memoryCost(this: AnyRoute) usize {
         return switch (this) {
             .static => |static_route| static_route.memoryCost(),
+            .file => |file_route| file_route.memoryCost(),
             .html => |html_bundle_route| html_bundle_route.data.memoryCost(),
             .framework_router => @sizeOf(bun.bake.Framework.FileSystemRouterType),
         };
@@ -90,6 +94,7 @@ pub const AnyRoute = union(enum) {
     pub fn setServer(this: AnyRoute, server: ?AnyServer) void {
         switch (this) {
             .static => |static_route| static_route.server = server,
+            .file => |file_route| file_route.server = server,
             .html => |html_bundle_route| html_bundle_route.server = server,
             .framework_router => {}, // DevServer contains .server field
         }
@@ -98,6 +103,7 @@ pub const AnyRoute = union(enum) {
     pub fn deref(this: AnyRoute) void {
         switch (this) {
             .static => |static_route| static_route.deref(),
+            .file => |file_route| file_route.deref(),
             .html => |html_bundle_route| html_bundle_route.deref(),
             .framework_router => {}, // not reference counted
         }
@@ -106,6 +112,7 @@ pub const AnyRoute = union(enum) {
     pub fn ref(this: AnyRoute) void {
         switch (this) {
             .static => |static_route| static_route.ref(),
+            .file => |file_route| file_route.ref(),
             .html => |html_bundle_route| html_bundle_route.ref(),
             .framework_router => {}, // not reference counted
         }
@@ -182,6 +189,9 @@ pub const AnyRoute = union(enum) {
             }
         }
 
+        if (try FileRoute.fromJS(global, argument)) |file_route| {
+            return .{ .file = file_route };
+        }
         return .{ .static = try StaticRoute.fromJS(global, argument) orelse return null };
     }
 };
@@ -2511,6 +2521,9 @@ pub fn NewServer(protocol_enum: enum { http, https }, development_kind: enum { d
                         .static => |static_route| {
                             ServerConfig.applyStaticRoute(any_server, ssl_enabled, app, *StaticRoute, static_route, entry.path, entry.method);
                         },
+                        .file => |file_route| {
+                            ServerConfig.applyStaticRoute(any_server, ssl_enabled, app, *FileRoute, file_route, entry.path, entry.method);
+                        },
                         .html => |html_bundle_route| {
                             ServerConfig.applyStaticRoute(any_server, ssl_enabled, app, *HTMLBundle.Route, html_bundle_route.data, entry.path, entry.method);
                             if (dev_server) |dev| {