Skip to content
Merged
Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
}
},
"dependencies": {
"@antelopejs/interface-api": ">=0.0.10 <1.0.0",
"@antelopejs/interface-api": ">=0.0.11 <1.0.0",
"@antelopejs/interface-api-util": "^0.1.1",
"@antelopejs/interface-core": "^0.0.6",
"reflect-metadata": "^0.2.2",
Expand Down
16 changes: 8 additions & 8 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

78 changes: 42 additions & 36 deletions src/server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -547,23 +547,37 @@ function extractError(error: unknown) {
return error;
}

function copyHeaders(source: HTTPResult, target: HTTPResult) {
if (source === target) {
return;
}
for (const [name, value] of Object.entries(source.peekHeaders() ?? {})) {
target.addHeader(name, value);
}
}

function replaceResponse(
requestContext: RequestContext,
result: unknown,
status: number,
) {
const previousResponse = requestContext.response;
const response =
result instanceof HTTPResult ? result : new HTTPResult(status, result);
copyHeaders(previousResponse, response);
requestContext.response = response;
}

function setHandlerResponse(requestContext: RequestContext, result: unknown) {
if (requestContext.response.isStream()) {
return;
}
if (result) {
requestContext.response = HTTPResult.withHeaders(
result,
requestContext.response.getHeaders(),
200,
);
if (result instanceof HTTPResult) {
replaceResponse(requestContext, result, 200);
return;
}
requestContext.response = HTTPResult.withHeaders(
"",
requestContext.response.getHeaders(),
200,
);
requestContext.response.setBody(result || "");
requestContext.response.setStatus(200);
}

function cloneResponse(response: HTTPResult) {
Expand All @@ -572,9 +586,7 @@ function cloneResponse(response: HTTPResult) {
response.getBody(),
response.getContentType(),
);
for (const [name, value] of Object.entries(response.getHeaders())) {
snapshot.addHeader(name, value);
}
copyHeaders(response, snapshot);
return snapshot;
}

Expand Down Expand Up @@ -731,13 +743,15 @@ function setMiddlewareResponse(
requestContext: RequestContext,
result: unknown,
): void {
if (result) {
requestContext.response = HTTPResult.withHeaders(
result,
requestContext.response.getHeaders(),
200,
);
if (!result) {
return;
}
if (result instanceof HTTPResult || requestContext.response.isStream()) {
replaceResponse(requestContext, result, 200);
return;
}
requestContext.response.setBody(result);
requestContext.response.setStatus(200);
}

function executePostfix(
Expand Down Expand Up @@ -775,6 +789,10 @@ function executeRequest(
handler = getHandler("get", path, roots.handler, false, exactPath);
}
const selectedHandler = Array.isArray(handler) ? undefined : handler;
if (!selectedHandler) {
requestContext.response.setBody("Not Found");
requestContext.response.setStatus(404);
}
if (!selectedHandler && method !== "options") {
return;
}
Expand Down Expand Up @@ -806,11 +824,7 @@ function completeRequest(
requestContext: RequestContext,
): Awaitable<void> {
if (didFail) {
requestContext.response = HTTPResult.withHeaders(
extractError(error),
requestContext.response.getHeaders(),
500,
);
replaceResponse(requestContext, extractError(error), 500);
}
requestContext.error = error;
const monitorExecution = executeMonitors(method, path, requestContext);
Expand All @@ -837,7 +851,7 @@ function processRequest(
rawResponse: res,
url,
routeParameters: {},
response: new HTTPResult(404, "Not Found"),
response: new HTTPResult(),
};
const path = url.pathname.split("/").filter((part) => part);
const method = req.method?.toLowerCase() || "get";
Expand Down Expand Up @@ -927,11 +941,7 @@ export async function upgradeListener(
);
const prefixResult = prefixExecution ? await prefixExecution : undefined;
if (prefixResult) {
requestContext.response = HTTPResult.withHeaders(
prefixResult,
requestContext.response.getHeaders(),
200,
);
setMiddlewareResponse(requestContext, prefixResult);
mustSendResponse = true;
mustDestroySocket = true;
// Fall through to finally block to execute monitors.
Expand All @@ -945,11 +955,7 @@ export async function upgradeListener(
requestError = error;
mustDestroySocket = true;
if (!hasUpgradedConnection) {
requestContext.response = HTTPResult.withHeaders(
extractError(error),
requestContext.response.getHeaders(),
500,
);
replaceResponse(requestContext, extractError(error), 500);
mustSendResponse = true;
}
} finally {
Expand Down
Loading
Loading