Skip to content

perf(ext/http): optimize away code based on callback length #18849

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.

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
merged 3 commits into from
Apr 26, 2023
Merged
Changes from all commits
Commits
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
30 changes: 20 additions & 10 deletions ext/http/00_serve.js
Original file line number Diff line number Diff line change
Expand Up @@ -361,16 +361,26 @@ async function asyncResponse(responseBodies, req, status, stream) {
*/
function mapToCallback(responseBodies, context, signal, callback, onError) {
return async function (req) {
const innerRequest = new InnerRequest(req, context);
const request = fromInnerRequest(innerRequest, signal, "immutable");

// Get the response from the user-provided callback. If that fails, use onError. If that fails, return a fallback
// 500 error.
let innerRequest;
let response;
try {
response = await callback(request, {
remoteAddr: innerRequest.remoteAddr,
});
if (callback.length > 0) {
innerRequest = new InnerRequest(req, context);
const request = fromInnerRequest(innerRequest, signal, "immutable");
if (callback.length === 1) {
response = await callback(request);
} else {
response = await callback(request, {
get remoteAddr() {
return innerRequest.remoteAddr;
},
});
}
} else {
response = await callback();
}
} catch (error) {
try {
response = await onError(error);
Expand All @@ -381,19 +391,19 @@ function mapToCallback(responseBodies, context, signal, callback, onError) {
}

const inner = toInnerResponse(response);
if (innerRequest[_upgraded]) {
if (innerRequest?.[_upgraded]) {
// We're done here as the connection has been upgraded during the callback and no longer requires servicing.
if (response !== UPGRADE_RESPONSE_SENTINEL) {
console.error("Upgrade response was not returned from callback");
context.close();
}
innerRequest[_upgraded]();
innerRequest?.[_upgraded]();
return;
}

// Did everything shut down while we were waiting?
if (context.closed) {
innerRequest.close();
innerRequest?.close();
return;
}

Expand All @@ -416,7 +426,7 @@ function mapToCallback(responseBodies, context, signal, callback, onError) {
core.ops.op_set_promise_complete(req, status);
}

innerRequest.close();
innerRequest?.close();
};
}

Expand Down