Skip to content

Keep the onAborted callback in an internal field of res #1330

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
uNetworkingAB merged 1 commit into from
Sep 28, 2026
Merged

Keep the onAborted callback in an internal field of res #1330

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions src/HttpResponseWrapper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,19 +222,21 @@ struct HttpResponseWrapper {
Isolate *isolate = args.GetIsolate();
auto *res = getHttpResponse<SSL>(args);
if (res) {
/* This thing perfectly fits in with unique_function, and will Reset on destructor */
UniquePersistent<Function> p(isolate, Local<Function>::Cast(args[0]));
/* The callback lives in internal field 1 of res, so one global handle per request instead of two */
args.This()->SetInternalField(1, args[0]);

/* This is how we capture res (C++ this in invocation of this function) */
UniquePersistent<Object> resObject(isolate, args.This());

res->onAborted([p = std::move(p), resObject = std::move(resObject), isolate]() {
res->onAborted([resObject = std::move(resObject), isolate]() {
HandleScope hs(isolate);

Local<Object> resLocal = Local<Object>::New(isolate, resObject);

/* Mark this resObject invalid */
setInternalPointer(Local<Object>::New(isolate, resObject), nullptr);//->SetAlignedPointerInInternalField(0, nullptr);
setInternalPointer(resLocal, nullptr);

CallJS(isolate, Local<Function>::New(isolate, p), 0, nullptr);
CallJS(isolate, Local<Function>::Cast(resLocal->GetInternalField(1).As<Value>()), 0, nullptr);
});

args.GetReturnValue().Set(args.This());
Expand Down Expand Up @@ -587,7 +589,8 @@ struct HttpResponseWrapper {
} else if (SSL == 3) {
resTemplateLocal->SetClassName(String::NewFromUtf8(isolate, "uWS.HttpCacheResponse", NewStringType::kNormal).ToLocalChecked());
}
resTemplateLocal->InstanceTemplate()->SetInternalFieldCount(1);
/* Field 0 is the native pointer, field 1 holds the onAborted callback */
resTemplateLocal->InstanceTemplate()->SetInternalFieldCount(2);

/* Register our functions (the most common go here) */
resTemplateLocal->PrototypeTemplate()->Set(String::NewFromUtf8(isolate, "end", NewStringType::kNormal).ToLocalChecked(), FunctionTemplate::New(isolate, res_end<SSL>));
Expand Down