Skip to content

feat: make response encoder return an express middleware #97

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
merged 1 commit into from
May 24, 2022
Merged

feat: make response encoder return an express middleware #97

Show file tree
Hide file tree
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
6 changes: 4 additions & 2 deletions packages/express-wrapper/src/request.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ export const decodeRequestAndEncodeResponse = (
): express.RequestHandler => {
return createNamedFunction(
'decodeRequestAndEncodeResponse' + httpRoute.method + apiName,
async (req, res) => {
async (req, res, next) => {
const maybeRequest = httpRoute.request.decode(req);
if (maybeRequest._tag === 'Left') {
console.log('Request failed to decode');
Expand All @@ -63,10 +63,12 @@ export const decodeRequestAndEncodeResponse = (
} catch (err) {
console.warn('Error in route handler:', err);
res.status(500).end();
next();
return;
}

responseEncoder(httpRoute, rawResponse, res);
const expressHandler = responseEncoder(httpRoute, rawResponse);
expressHandler(req, res, next);
},
);
};
44 changes: 20 additions & 24 deletions packages/express-wrapper/src/response.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,28 +22,24 @@ export type NumericOrKeyedResponseType<R extends HttpRoute> =
export type ResponseEncoder = (
route: HttpRoute,
serviceFnResponse: NumericOrKeyedResponseType<HttpRoute>,
expressRes: express.Response,
) => void;
) => express.RequestHandler;

export const defaultResponseEncoder: ResponseEncoder = (
route,
serviceFnResponse,
expressRes,
) => {
const { type, payload } = serviceFnResponse;
const status = typeof type === 'number' ? type : (KeyToHttpStatus as any)[type];
if (status === undefined) {
console.warn('Unknown status code returned');
expressRes.status(500).end();
return;
}
const responseCodec = route.response[status];
try {
expressRes.status(status).json(responseCodec!.encode(payload)).end();
} catch {
console.warn(
"Unable to encode route's return value, did you return the expected type?",
);
expressRes.status(500).end();
}
};
export const defaultResponseEncoder: ResponseEncoder =
(route, serviceFnResponse) => (_req, res) => {
const { type, payload } = serviceFnResponse;
const status = typeof type === 'number' ? type : (KeyToHttpStatus as any)[type];
if (status === undefined) {
console.warn('Unknown status code returned');
res.status(500).end();
return;
}
const responseCodec = route.response[status];
try {
res.status(status).json(responseCodec!.encode(payload)).end();
} catch {
console.warn(
"Unable to encode route's return value, did you return the expected type?",
);
res.status(500).end();
}
};