writer contentDisposition

Author: cirospaciari

src/bun.js/webcore/Blob.zig

@@ -2636,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,
                 );
@@ -2654,6 +2663,7 @@ pub fn getWriter(
             globalThis,
             .{},
             this.contentTypeOrMimeType(),
+            null,
             proxy_url,
             null,
         );

src/s3/client.zig

@@ -254,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 {
@@ -297,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),

test/js/bun/s3/s3.test.ts

@@ -431,6 +431,19 @@ for (let credentials of allCredentials) {
                 expect(response.headers.get("content-disposition")).toBe('attachment; filename="report.pdf"');
               }
             });
+            it("should be able to set content-disposition in writer", async () => {
+              await using tmpfile = await tmp();
+              {
+                const s3file = bucket.file(tmpfile.name, options!);
+                const writer = s3file.writer({
+                  contentDisposition: 'attachment; filename="test.txt"',
+                });
+                writer.write("Hello Bun!!");
+                await writer.end();
+                const response = await fetch(s3file.presign());
+                expect(response.headers.get("content-disposition")).toBe('attachment; filename="test.txt"');
+              }
+            });
 
             it("should be able to upload large files using bucket.write + readable Request", async () => {
               await using tmpfile = await tmp();