Merge branch 'main' into main

Author: ixchio

docs/runtime/http/server.mdx

@@ -193,15 +193,17 @@ This is the maximum amount of time a connection is allowed to be idle before the
 Thus far, the examples on this page have used the explicit `Bun.serve` API. Bun also supports an alternate syntax.
 
 ```ts server.ts
-import { type Serve } from "bun";
+import type { Serve } from "bun";
 
 export default {
   fetch(req) {
     return new Response("Bun!");
   },
-} satisfies Serve;
+} satisfies Serve.Options<undefined>;
 ```
 
+The type parameter `<undefined>` represents WebSocket data — if you add a `websocket` handler with custom data attached via `server.upgrade(req, { data: ... })`, replace `undefined` with your data type.
+
 Instead of passing the server options into `Bun.serve`, `export default` it. This file can be executed as-is; when Bun sees a file with a `default` export containing a `fetch` handler, it passes it into `Bun.serve` under the hood.
 
 ---

packages/bun-types/bun.d.ts

@@ -1740,9 +1740,9 @@ declare module "bun" {
      * @default "esm"
      */
     format?: /**
-       * ECMAScript Module format
-       */
-      | "esm"
+     * ECMAScript Module format
+     */
+    | "esm"
       /**
        * CommonJS format
        * **Experimental**
@@ -3316,10 +3316,10 @@ declare module "bun" {
   function color(
     input: ColorInput,
     outputFormat?: /**
-       * True color ANSI color string, for use in terminals
-       * @example \x1b[38;2;100;200;200m
-       */
-      | "ansi"
+     * True color ANSI color string, for use in terminals
+     * @example \x1b[38;2;100;200;200m
+     */
+    | "ansi"
       | "ansi-16"
       | "ansi-16m"
       /**
@@ -5650,17 +5650,11 @@ declare module "bun" {
       maxBuffer?: number;
     }
 
-    interface SpawnSyncOptions<In extends Writable, Out extends Readable, Err extends Readable> extends BaseOptions<
-      In,
-      Out,
-      Err
-    > {}
-
-    interface SpawnOptions<In extends Writable, Out extends Readable, Err extends Readable> extends BaseOptions<
-      In,
-      Out,
-      Err
-    > {
+    interface SpawnSyncOptions<In extends Writable, Out extends Readable, Err extends Readable>
+      extends BaseOptions<In, Out, Err> {}
+
+    interface SpawnOptions<In extends Writable, Out extends Readable, Err extends Readable>
+      extends BaseOptions<In, Out, Err> {
       /**
        * If true, stdout and stderr pipes will not automatically start reading
        * data. Reading will only begin when you access the `stdout` or `stderr`

packages/bun-types/s3.d.ts

@@ -281,6 +281,24 @@ declare module "bun" {
      */
     type?: string;
 
+    /**
+     * The Content-Disposition header value.
+     * Controls how the file is presented when downloaded.
+     *
+     * @example
+     *    // Setting attachment disposition with filename
+     *     const file = s3.file("report.pdf", {
+     *       contentDisposition: "attachment; filename=\"quarterly-report.pdf\""
+     *     });
+     *
+     * @example
+     *    // Setting inline disposition
+     *     await s3.write("image.png", imageData, {
+     *       contentDisposition: "inline"
+     *     });
+     */
+    contentDisposition?: string | undefined;
+
     /**
      * By default, Amazon S3 uses the STANDARD Storage Class to store newly created objects.
      *

src/bun.js/webcore/Blob.zig

@@ -968,6 +968,7 @@ fn writeFileWithEmptySourceToDestination(ctx: *jsc.JSGlobalObject, destination_b
                 s3.path(),
                 "",
                 destination_blob.contentTypeOrMimeType(),
+                aws_options.content_disposition,
                 aws_options.acl,
                 proxy_url,
                 aws_options.storage_class,
@@ -1116,6 +1117,7 @@ pub fn writeFileWithSourceDestination(ctx: *jsc.JSGlobalObject, source_blob: *Bl
                             aws_options.acl,
                             aws_options.storage_class,
                             destination_blob.contentTypeOrMimeType(),
+                            aws_options.content_disposition,
                             proxy_url,
                             null,
                             undefined,
@@ -1154,6 +1156,7 @@ pub fn writeFileWithSourceDestination(ctx: *jsc.JSGlobalObject, source_blob: *Bl
                         s3.path(),
                         bytes.slice(),
                         destination_blob.contentTypeOrMimeType(),
+                        aws_options.content_disposition,
                         aws_options.acl,
                         proxy_url,
                         aws_options.storage_class,
@@ -1183,6 +1186,7 @@ pub fn writeFileWithSourceDestination(ctx: *jsc.JSGlobalObject, source_blob: *Bl
                         aws_options.acl,
                         aws_options.storage_class,
                         destination_blob.contentTypeOrMimeType(),
+                        aws_options.content_disposition,
                         proxy_url,
                         null,
                         undefined,
@@ -1387,6 +1391,7 @@ pub fn writeFileInternal(globalThis: *jsc.JSGlobalObject, path_or_blob_: *PathOr
                                 aws_options.acl,
                                 aws_options.storage_class,
                                 destination_blob.contentTypeOrMimeType(),
+                                aws_options.content_disposition,
                                 proxy_url,
                                 null,
                                 undefined,
@@ -1447,6 +1452,7 @@ pub fn writeFileInternal(globalThis: *jsc.JSGlobalObject, path_or_blob_: *PathOr
                                 aws_options.acl,
                                 aws_options.storage_class,
                                 destination_blob.contentTypeOrMimeType(),
+                                aws_options.content_disposition,
                                 proxy_url,
                                 null,
                                 undefined,
@@ -2402,6 +2408,7 @@ pub fn pipeReadableStreamToBlob(this: *Blob, globalThis: *jsc.JSGlobalObject, re
             aws_options.acl,
             aws_options.storage_class,
             this.contentTypeOrMimeType(),
+            aws_options.content_disposition,
             proxy_url,
             null,
             undefined,
@@ -2629,13 +2636,22 @@ pub fn getWriter(
                         }
                     }
                 }
+                var content_disposition_str: ?ZigString.Slice = null;
+                defer if (content_disposition_str) |cd| cd.deinit();
+                if (try options.getTruthy(globalThis, "contentDisposition")) |content_disposition| {
+                    if (!content_disposition.isString()) {
+                        return globalThis.throwInvalidArgumentType("write", "options.contentDisposition", "string");
+                    }
+                    content_disposition_str = try content_disposition.toSlice(globalThis, bun.default_allocator);
+                }
                 const credentialsWithOptions = try s3.getCredentialsWithOptions(options, globalThis);
                 return try S3.writableStream(
                     credentialsWithOptions.credentials.dupe(),
                     path,
                     globalThis,
                     credentialsWithOptions.options,
                     this.contentTypeOrMimeType(),
+                    if (content_disposition_str) |cd| cd.slice() else null,
                     proxy_url,
                     credentialsWithOptions.storage_class,
                 );
@@ -2647,6 +2663,7 @@ pub fn getWriter(
             globalThis,
             .{},
             this.contentTypeOrMimeType(),
+            null,
             proxy_url,
             null,
         );

src/bun.js/webcore/fetch.zig

@@ -1301,6 +1301,7 @@ pub fn Bun__fetch_(
                 credentialsWithOptions.acl,
                 credentialsWithOptions.storage_class,
                 if (headers) |h| (h.getContentType()) else null,
+                if (headers) |h| h.getContentDisposition() else null,
                 proxy_url,
                 @ptrCast(&Wrapper.resolve),
                 s3_stream,

src/http/Headers.zig

@@ -75,20 +75,12 @@ pub fn deinit(this: *Headers) void {
     this.entries.deinit(this.allocator);
     this.buf.clearAndFree(this.allocator);
 }
-pub fn getContentType(this: *const Headers) ?[]const u8 {
-    if (this.entries.len == 0 or this.buf.items.len == 0) {
-        return null;
-    }
-    const header_entries = this.entries.slice();
-    const header_names = header_entries.items(.name);
-    const header_values = header_entries.items(.value);
 
-    for (header_names, 0..header_names.len) |name, i| {
-        if (bun.strings.eqlCaseInsensitiveASCII(this.asStr(name), "content-type", true)) {
-            return this.asStr(header_values[i]);
-        }
-    }
-    return null;
+pub fn getContentDisposition(this: *const Headers) ?[]const u8 {
+    return this.get("content-disposition");
+}
+pub fn getContentType(this: *const Headers) ?[]const u8 {
+    return this.get("content-type");
 }
 pub fn asStr(this: *const Headers, ptr: api.StringPointer) []const u8 {
     return if (ptr.offset + ptr.length <= this.buf.items.len)

src/s3/client.zig

@@ -229,6 +229,7 @@ pub fn upload(
     path: []const u8,
     content: []const u8,
     content_type: ?[]const u8,
+    content_disposition: ?[]const u8,
     acl: ?ACL,
     proxy_url: ?[]const u8,
     storage_class: ?StorageClass,
@@ -241,6 +242,7 @@ pub fn upload(
         .proxy_url = proxy_url,
         .body = content,
         .content_type = content_type,
+        .content_disposition = content_disposition,
         .acl = acl,
         .storage_class = storage_class,
     }, .{ .upload = callback }, callback_context);
@@ -252,6 +254,7 @@ pub fn writableStream(
     globalThis: *jsc.JSGlobalObject,
     options: MultiPartUploadOptions,
     content_type: ?[]const u8,
+    content_disposition: ?[]const u8,
     proxy: ?[]const u8,
     storage_class: ?StorageClass,
 ) bun.JSError!jsc.JSValue {
@@ -295,6 +298,7 @@ pub fn writableStream(
         .path = bun.handleOom(bun.default_allocator.dupe(u8, path)),
         .proxy = if (proxy_url.len > 0) bun.handleOom(bun.default_allocator.dupe(u8, proxy_url)) else "",
         .content_type = if (content_type) |ct| bun.handleOom(bun.default_allocator.dupe(u8, ct)) else null,
+        .content_disposition = if (content_disposition) |cd| bun.handleOom(bun.default_allocator.dupe(u8, cd)) else null,
         .storage_class = storage_class,
 
         .callback = @ptrCast(&Wrapper.callback),
@@ -434,6 +438,7 @@ pub fn uploadStream(
     acl: ?ACL,
     storage_class: ?StorageClass,
     content_type: ?[]const u8,
+    content_disposition: ?[]const u8,
     proxy: ?[]const u8,
     callback: ?*const fn (S3UploadResult, *anyopaque) void,
     callback_context: *anyopaque,
@@ -470,6 +475,7 @@ pub fn uploadStream(
         .path = bun.handleOom(bun.default_allocator.dupe(u8, path)),
         .proxy = if (proxy_url.len > 0) bun.handleOom(bun.default_allocator.dupe(u8, proxy_url)) else "",
         .content_type = if (content_type) |ct| bun.handleOom(bun.default_allocator.dupe(u8, ct)) else null,
+        .content_disposition = if (content_disposition) |cd| bun.handleOom(bun.default_allocator.dupe(u8, cd)) else null,
         .callback = @ptrCast(&S3UploadStreamWrapper.resolve),
         .callback_context = undefined,
         .globalThis = globalThis,