From 33565e16ca0f9d2d04e2c43b7f6949106ba8cf18 Mon Sep 17 00:00:00 2001 From: Jared Flatow Date: Fri, 27 Oct 2023 04:34:41 -0700 Subject: fix(ext/http): patch regression in variadic args to serve handler (#20796) I'm not sure what was the purpose of trying to be so clever with the args were (maybe an optimization?), but it breaks variadic args as pointed out in #20054. Signed-off-by: Matt Mastracci Co-authored-by: Matt Mastracci --- ext/http/00_serve.js | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) (limited to 'ext/http/00_serve.js') diff --git a/ext/http/00_serve.js b/ext/http/00_serve.js index 2e0c62fef..17a67814b 100644 --- a/ext/http/00_serve.js +++ b/ext/http/00_serve.js @@ -435,8 +435,6 @@ function fastSyncResponseOrStream(req, respBody, status) { */ function mapToCallback(context, callback, onError) { const signal = context.abortController.signal; - const hasCallback = callback.length > 0; - const hasOneCallback = callback.length === 1; return async function (req) { // Get the response from the user-provided callback. If that fails, use onError. If that fails, return a fallback @@ -444,20 +442,11 @@ function mapToCallback(context, callback, onError) { let innerRequest; let response; try { - if (hasCallback) { - innerRequest = new InnerRequest(req, context); - const request = fromInnerRequest(innerRequest, signal, "immutable"); - if (hasOneCallback) { - response = await callback(request); - } else { - response = await callback( - request, - new ServeHandlerInfo(innerRequest), - ); - } - } else { - response = await callback(); - } + innerRequest = new InnerRequest(req, context); + response = await callback( + fromInnerRequest(innerRequest, signal, "immutable"), + new ServeHandlerInfo(innerRequest), + ); } catch (error) { try { response = await onError(error); -- cgit v1.2.3