HTMLRewriter: read the input body through ResumableSink instead of ValueBufferer

src/jsc/bindings/NativePromiseContext.h

@@ -42,7 +42,6 @@ class NativePromiseContext final : public JSC::JSCell {
         HTTPSServerRequestContext,
         DebugHTTPServerRequestContext,
         DebugHTTPSServerRequestContext,
-        BodyValueBufferer,
         HTTPSServerH3RequestContext,
         DebugHTTPSServerH3RequestContext,
     };

src/jsc/bindings/ZigGlobalObject.cpp

@@ -4040,10 +4040,10 @@ GlobalObject::PromiseFunctions GlobalObject::promiseHandlerID(Zig::FFIFunction h
         return GlobalObject::PromiseFunctions::Bun__TestScope__Describe2__bunTestThen;
     } else if (handler == Bun__TestScope__Describe2__bunTestCatch) {
         return GlobalObject::PromiseFunctions::Bun__TestScope__Describe2__bunTestCatch;
-    } else if (handler == Bun__BodyValueBufferer__onResolveStream) {
-        return GlobalObject::PromiseFunctions::Bun__BodyValueBufferer__onResolveStream;
-    } else if (handler == Bun__BodyValueBufferer__onRejectStream) {
-        return GlobalObject::PromiseFunctions::Bun__BodyValueBufferer__onRejectStream;
+    } else if (handler == Bun__WriteFileLocked__onStreamResolved) {
+        return GlobalObject::PromiseFunctions::Bun__WriteFileLocked__onStreamResolved;
+    } else if (handler == Bun__WriteFileLocked__onStreamRejected) {
+        return GlobalObject::PromiseFunctions::Bun__WriteFileLocked__onStreamRejected;
     } else if (handler == Bun__onResolveEntryPointResult) {
         return GlobalObject::PromiseFunctions::Bun__onResolveEntryPointResult;
     } else if (handler == Bun__onRejectEntryPointResult) {

src/jsc/bindings/ZigGlobalObject.h

@@ -392,8 +392,8 @@ class GlobalObject : public Bun::GlobalScope {
         jsFunctionOnLoadObjectResultReject,
         Bun__TestScope__Describe2__bunTestThen,
         Bun__TestScope__Describe2__bunTestCatch,
-        Bun__BodyValueBufferer__onRejectStream,
-        Bun__BodyValueBufferer__onResolveStream,
+        Bun__WriteFileLocked__onStreamResolved,
+        Bun__WriteFileLocked__onStreamRejected,
         Bun__onResolveEntryPointResult,
         Bun__onRejectEntryPointResult,
         Bun__NodeHTTPRequest__onResolve,

src/jsc/bindings/headers-cpp.h

@@ -182,9 +182,6 @@ extern "C" const size_t Bun__Timer_object_align_ = alignof(Bun__Timer);
 #include ""
 #endif
 
-extern "C" const size_t Bun__BodyValueBufferer_object_size_ = sizeof(Bun__BodyValueBufferer);
-extern "C" const size_t Bun__BodyValueBufferer_object_align_ = alignof(Bun__BodyValueBufferer);
-
 const size_t sizes[39] = {sizeof(JSC::JSObject), sizeof(WebCore::DOMURL), sizeof(WebCore::DOMFormData), sizeof(WebCore::FetchHeaders), sizeof(SystemError), sizeof(JSC::JSCell), sizeof(JSC::JSString), sizeof(JSC::JSModuleLoader), sizeof(WebCore::AbortSignal), sizeof(JSC::JSPromise), sizeof(JSC::JSPromise), sizeof(JSC::JSFunction), sizeof(JSC::JSGlobalObject), sizeof(JSC::JSMap), sizeof(JSC::JSValue), sizeof(JSC::Exception), sizeof(JSC::VM), sizeof(JSC::ThrowScope), sizeof(JSC::TopExceptionScope), sizeof(FFI__ptr), sizeof(Reader__u8), sizeof(Reader__u16), sizeof(Reader__u32), sizeof(Reader__ptr), sizeof(Reader__i8), sizeof(Reader__i16), sizeof(Reader__i32), sizeof(Reader__f32), sizeof(Reader__f64), sizeof(Reader__i64), sizeof(Reader__u64), sizeof(Reader__intptr), sizeof(Zig::GlobalObject), sizeof(Bun__Path), sizeof(ArrayBufferSink), sizeof(HTTPSResponseSink), sizeof(HTTPResponseSink), sizeof(FileSink), sizeof(FileSink)};
 
 const size_t aligns[39] = {alignof(JSC::JSObject), alignof(WebCore::DOMURL), alignof(WebCore::DOMFormData), alignof(WebCore::FetchHeaders), alignof(SystemError), alignof(JSC::JSCell), alignof(JSC::JSString), alignof(JSC::JSModuleLoader), alignof(WebCore::AbortSignal), alignof(JSC::JSPromise), alignof(JSC::JSPromise), alignof(JSC::JSFunction), alignof(JSC::JSGlobalObject), alignof(JSC::JSMap), alignof(JSC::JSValue), alignof(JSC::Exception), alignof(JSC::VM), alignof(JSC::ThrowScope), alignof(JSC::TopExceptionScope), alignof(FFI__ptr), alignof(Reader__u8), alignof(Reader__u16), alignof(Reader__u32), alignof(Reader__ptr), alignof(Reader__i8), alignof(Reader__i16), alignof(Reader__i32), alignof(Reader__f32), alignof(Reader__f64), alignof(Reader__i64), alignof(Reader__u64), alignof(Reader__intptr), alignof(Zig::GlobalObject), alignof(Bun__Path), alignof(ArrayBufferSink), alignof(HTTPSResponseSink), alignof(HTTPResponseSink), alignof(FileSink), alignof(FileSink)};

src/jsc/generated.rs

@@ -1134,8 +1134,9 @@ js_class_module!(JSBlob      = "Blob"      as crate::webcore_types::Blob { name,
 js_class_module!(JSResponse  = "Response"  { body, headers, url, statusText, stream });
 js_class_module!(JSRequest   = "Request"   { body, headers, url, signal, stream });
 // `values: ["ondrain", "oncancel", "stream"]` in src/runtime/api/ResumableSink.classes.ts.
-js_class_module!(JSResumableFetchSink    = "ResumableFetchSink"    { ondrain, oncancel, stream });
-js_class_module!(JSResumableS3UploadSink = "ResumableS3UploadSink" { ondrain, oncancel, stream });
+js_class_module!(JSResumableFetchSink        = "ResumableFetchSink"        { ondrain, oncancel, stream });
+js_class_module!(JSResumableS3UploadSink     = "ResumableS3UploadSink"     { ondrain, oncancel, stream });
+js_class_module!(JSResumableHTMLRewriterSink = "ResumableHTMLRewriterSink" { ondrain, oncancel, stream });
 // `values: ["resolve", "reject"]` in src/runtime/api/Shell.classes.ts.
 js_class_module!(JSShellInterpreter      = "ShellInterpreter"      { resolve, reject });
 // `src/runtime/crypto/crypto.classes.ts` — one entry per `StaticCryptoHasher`

src/jsc/generated_classes_list.rs

@@ -98,6 +98,7 @@ pub mod Classes {
     pub use crate::webcore::Request;
     pub use crate::webcore::Response;
     pub use crate::webcore::ResumableFetchSink;
+    pub use crate::webcore::ResumableHTMLRewriterSink;
     pub use crate::webcore::ResumableS3UploadSink;
     pub use crate::webcore::S3Client;
     pub use crate::webcore::S3Stat;

src/runtime/api/NativePromiseContext.rs

@@ -24,9 +24,7 @@ use bun_event_loop::{Task, TaskTag, Taskable, task_tag};
 use bun_jsc::virtual_machine::VirtualMachine;
 use bun_jsc::{JSGlobalObject, JSValue};
 
-use crate::api::html_rewriter;
 use crate::api::server;
-use crate::webcore::body;
 
 // Request contexts are a single generic
 // `NewRequestContext<ThisServer, SSL, DEBUG, HTTP3>`; alias the six
@@ -53,13 +51,12 @@ pub enum Tag {
     HTTPSServerRequestContext,
     DebugHTTPServerRequestContext,
     DebugHTTPSServerRequestContext,
-    BodyValueBufferer,
     HTTPSServerH3RequestContext,
     DebugHTTPSServerH3RequestContext,
 }
 
 impl Tag {
-    pub const COUNT: usize = 7;
+    pub const COUNT: usize = 6;
 
     #[inline]
     const fn from_raw(n: u8) -> Tag {
@@ -68,9 +65,8 @@ impl Tag {
             1 => Tag::HTTPSServerRequestContext,
             2 => Tag::DebugHTTPServerRequestContext,
             3 => Tag::DebugHTTPSServerRequestContext,
-            4 => Tag::BodyValueBufferer,
-            5 => Tag::HTTPSServerH3RequestContext,
-            6 => Tag::DebugHTTPSServerH3RequestContext,
+            4 => Tag::HTTPSServerH3RequestContext,
+            5 => Tag::DebugHTTPSServerH3RequestContext,
             _ => unreachable!(),
         }
     }
@@ -103,9 +99,6 @@ impl<ThisServer, const SSL: bool, const DBG: bool, const H3: bool> NativePromise
 {
     const TAG: Tag = npc_tag_for(SSL, DBG, H3);
 }
-impl NativePromiseContextType for body::ValueBufferer<'_> {
-    const TAG: Tag = Tag::BodyValueBufferer;
-}
 
 // `&JSGlobalObject` is ABI-identical to a non-null pointer. `ctx` is stored
 // opaquely (never dereferenced by the C++ side), so the FFI itself has no
@@ -214,16 +207,6 @@ impl DeferredDerefTask {
                 Tag::DebugHTTPSServerRequestContext => {
                     (*ctx.cast::<DebugHTTPSServerRequestContext>()).deref()
                 }
-                Tag::BodyValueBufferer => {
-                    // ValueBufferer is embedded by value inside HTMLRewriter's
-                    // BufferOutputSink, with the owner pointer stored in .ctx.
-                    // The pending-promise ref was taken on the owner, so we
-                    // release it there.
-                    let bufferer = &*ctx.cast::<body::ValueBufferer<'_>>();
-                    html_rewriter::BufferOutputSink::deref(
-                        bufferer.ctx.cast::<html_rewriter::BufferOutputSink>(),
-                    );
-                }
                 Tag::HTTPSServerH3RequestContext => {
                     (*ctx.cast::<HTTPSServerH3RequestContext>()).deref()
                 }
@@ -246,5 +229,3 @@ const _: () =
     assert!(core::mem::align_of::<DebugHTTPServerRequestContext>() > DeferredDerefTask::TAG_MASK);
 const _: () =
     assert!(core::mem::align_of::<DebugHTTPSServerRequestContext>() > DeferredDerefTask::TAG_MASK);
-const _: () =
-    assert!(core::mem::align_of::<body::ValueBufferer<'_>>() > DeferredDerefTask::TAG_MASK);

src/runtime/api/ResumableSink.classes.ts

@@ -32,4 +32,8 @@ function generate(name) {
     values: ["ondrain", "oncancel", "stream"],
   });
 }
-export default [generate("ResumableFetchSink"), generate("ResumableS3UploadSink")];
+export default [
+  generate("ResumableFetchSink"),
+  generate("ResumableS3UploadSink"),
+  generate("ResumableHTMLRewriterSink"),
+];