Skip to content
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

Allow errors handling customization #19

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Allow errors handling customization #19

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
36 changes: 21 additions & 15 deletions src/lib/server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,25 @@ export class ODataServerBase extends Transform{
static namespace:string
static container = new ContainerBase();
private serverType:typeof ODataServer

static function errorHandler(){
return (err, _, res, next) => {
if (err){
if (res.headersSent) {
return next(err);
}
let statusCode = err.statusCode || err.status || (res.statusCode < 400 ? 500 : res.statusCode);
if (!res.statusCode || res.statusCode < 400) res.status(statusCode);
res.send({
error: {
code: statusCode,
message: err.message,
stack: err.stack
}
});
}else next();
}
}

static requestHandler(){
return (req:express.Request, res:express.Response, next:express.NextFunction) => {
Expand Down Expand Up @@ -274,7 +293,7 @@ export class ODataServerBase extends Transform{
}, server.document().requestHandler());
router.get("/\\$metadata", server.$metadata().requestHandler());
router.use(server.requestHandler());
router.use(ODataErrorHandler);
router.use(server.errorHandler());

if (typeof path == "number"){
if (typeof port == "string"){
Expand All @@ -296,20 +315,7 @@ export class ODataServer extends ODataBase<ODataServerBase, typeof ODataServerBa
/** ?????????? */
/** Create Express middleware for OData error handling */
export function ODataErrorHandler(err, _, res, next){
if (err){
if (res.headersSent) {
return next(err);
}
let statusCode = err.statusCode || err.status || (res.statusCode < 400 ? 500 : res.statusCode);
if (!res.statusCode || res.statusCode < 400) res.status(statusCode);
res.send({
error: {
code: statusCode,
message: err.message,
stack: err.stack
}
});
}else next();
return ODataServerBase.errorHandler()(err, _, res, next);
}

/** Create Express server for OData Server
Expand Down