mirrors/bun.sh
1
0
Fork 0
mirror of https://github.com/oven-sh/bun synced 2026-02-11 19:38:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clean-up after #18485 (#18489)

Browse Source
This commit is contained in:
Jarred Sumner
2025-03-26 04:46:35 -07:00
committed by GitHub
parent 49ca2c86e7
commit 57cda4a445
11 changed files with 558 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/bun.js/bindings/NodeHTTP.cpp
View File

@@ -26,7 +26,7 @@ extern "C" uint64_t uws_res_get_remote_address_info(void* res, const char** dest
extern "C" uint64_t uws_res_get_local_address_info(void* res, const char** dest, int* port, bool* is_ipv6);
extern "C" void Bun__NodeHTTPResponse_setClosed(void* zigResponse);
extern "C" void Bun__NodeHTTPResponse_onClose(void* zigResponse, JSC::EncodedJSValue jsValue);
namespace Bun {
using namespace JSC;
@@ -183,20 +183,27 @@ public:
[](auto& spaces, auto&& space) { spaces.m_subspaceForJSNodeHTTPServerSocket = std::forward<decltype(space)>(space); });
}
void detach()
{
this->m_duplex.clear();
this->currentResponseObject.clear();
this->strongThis.clear();
}
void onClose()
{
this->socket = nullptr;
this->m_duplex.clear();
if (auto* res = this->currentResponseObject.get(); res != nullptr && res->m_ctx != nullptr) {
Bun__NodeHTTPResponse_setClosed(res->m_ctx);
}
this->currentResponseObject.clear();
// This function can be called during GC!
Zig::GlobalObject* globalObject = static_cast<Zig::GlobalObject*>(this->globalObject());
if (!functionToCallOnClose) {
this->strongThis.clear();
if (auto* res = this->currentResponseObject.get(); res != nullptr && res->m_ctx != nullptr) {
Bun__NodeHTTPResponse_onClose(res->m_ctx, JSValue::encode(res));
}
this->detach();
return;
}
@@ -209,7 +216,10 @@ public:
auto* thisObject = self;
auto* callbackObject = thisObject->functionToCallOnClose.get();
if (!callbackObject) {
self->strongThis.clear();
if (auto* res = thisObject->currentResponseObject.get(); res != nullptr && res->m_ctx != nullptr) {
Bun__NodeHTTPResponse_onClose(res->m_ctx, JSValue::encode(res));
}
thisObject->detach();
return;
}
auto callData = JSC::getCallData(callbackObject);
@@ -217,6 +227,10 @@ public:
EnsureStillAliveScope ensureStillAlive(self);
if (globalObject->scriptExecutionStatus(globalObject, thisObject) == ScriptExecutionStatus::Running) {
if (auto* res = thisObject->currentResponseObject.get(); res != nullptr && res->m_ctx != nullptr) {
Bun__NodeHTTPResponse_onClose(res->m_ctx, JSValue::encode(res));
}
profiledCall(globalObject, JSC::ProfilingReason::API, callbackObject, callData, thisObject, args, exception);
if (auto* ptr = exception.get()) {
@@ -224,7 +238,7 @@ public:
globalObject->reportUncaughtExceptionAtEventLoop(globalObject, ptr);
}
}
self->strongThis.clear();
thisObject->detach();
});
}
}
@@ -252,6 +266,7 @@ JSC_DEFINE_HOST_FUNCTION(jsFunctionNodeHTTPServerSocketClose, (JSC::JSGlobalObje
return JSValue::encode(JSC::jsUndefined());
}
thisObject->close();
return JSValue::encode(JSC::jsUndefined());
}