mirror of
https://github.com/awatertrevi/infisical.git
synced 2026-10-07 18:27:36 +00:00
feat: Patch Router#handle to catch Promise Rejection
In order to catch Promise rejections inside and outside of middlewares as well as in route logic we need to patch `Router#handle` and add .catch() to the function. With that addition it is possible to catch rejections and handle inside `requestErrorHandler` middleware.
This commit is contained in:
+4
-2
@@ -1,4 +1,5 @@
|
|||||||
|
|
||||||
|
import { patchRouterParam } from './utils/patchAsyncRoutes';
|
||||||
import express from 'express';
|
import express from 'express';
|
||||||
import helmet from 'helmet';
|
import helmet from 'helmet';
|
||||||
import cors from 'cors';
|
import cors from 'cors';
|
||||||
@@ -30,9 +31,11 @@ import {
|
|||||||
} from './routes';
|
} from './routes';
|
||||||
import { getLogger } from './utils/logger';
|
import { getLogger } from './utils/logger';
|
||||||
import { RouteNotFoundError } from './utils/errors';
|
import { RouteNotFoundError } from './utils/errors';
|
||||||
import { errorHandler } from '@sentry/node/types/handlers';
|
|
||||||
import { requestErrorHandler } from './middleware/requestErrorHandler';
|
import { requestErrorHandler } from './middleware/requestErrorHandler';
|
||||||
|
|
||||||
|
//* Patch Async route params to handle Promise Rejections
|
||||||
|
patchRouterParam()
|
||||||
|
|
||||||
export const app = express();
|
export const app = express();
|
||||||
|
|
||||||
app.enable('trust proxy');
|
app.enable('trust proxy');
|
||||||
@@ -53,7 +56,6 @@ if (NODE_ENV === 'production') {
|
|||||||
app.use(helmet());
|
app.use(helmet());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// routers
|
// routers
|
||||||
app.use('/api/v1/signup', signupRouter);
|
app.use('/api/v1/signup', signupRouter);
|
||||||
app.use('/api/v1/auth', authRouter);
|
app.use('/api/v1/auth', authRouter);
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ const JWT_SIGNUP_LIFETIME = process.env.JWT_SIGNUP_LIFETIME! || '15m';
|
|||||||
const JWT_SIGNUP_SECRET = process.env.JWT_SIGNUP_SECRET!;
|
const JWT_SIGNUP_SECRET = process.env.JWT_SIGNUP_SECRET!;
|
||||||
const MONGO_URL = process.env.MONGO_URL!;
|
const MONGO_URL = process.env.MONGO_URL!;
|
||||||
const NODE_ENV = process.env.NODE_ENV! || 'production';
|
const NODE_ENV = process.env.NODE_ENV! || 'production';
|
||||||
const VERBOSE_ERROR_OUTPUT = process.env.VERBOSE_ERROR_OUTPUT! !== 'true' && true;
|
const VERBOSE_ERROR_OUTPUT = process.env.VERBOSE_ERROR_OUTPUT! === 'true' && true;
|
||||||
const LOKI_HOST = process.env.LOKI_HOST || undefined;
|
const LOKI_HOST = process.env.LOKI_HOST || undefined;
|
||||||
const CLIENT_SECRET_HEROKU = process.env.CLIENT_SECRET_HEROKU!;
|
const CLIENT_SECRET_HEROKU = process.env.CLIENT_SECRET_HEROKU!;
|
||||||
const CLIENT_ID_HEROKU = process.env.CLIENT_ID_HEROKU!;
|
const CLIENT_ID_HEROKU = process.env.CLIENT_ID_HEROKU!;
|
||||||
|
|||||||
@@ -0,0 +1,65 @@
|
|||||||
|
/*
|
||||||
|
Original work Copyright (c) 2016, Nikolay Nemshilov <[email protected]>
|
||||||
|
Modified work Copyright (c) 2016, David Banham <[email protected]>
|
||||||
|
|
||||||
|
Permission to use, copy, modify, and/or distribute this software for any purpose
|
||||||
|
with or without fee is hereby granted, provided that the above copyright notice
|
||||||
|
and this permission notice appear in all copies.
|
||||||
|
|
||||||
|
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
|
||||||
|
REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
|
||||||
|
FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
|
||||||
|
INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
|
||||||
|
OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
|
||||||
|
TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
|
||||||
|
THIS SOFTWARE.
|
||||||
|
|
||||||
|
*/
|
||||||
|
|
||||||
|
/* eslint-disable @typescript-eslint/no-var-requires */
|
||||||
|
/* eslint-env node */
|
||||||
|
const Layer = require('express/lib/router/layer');
|
||||||
|
const Router = require('express/lib/router');
|
||||||
|
|
||||||
|
const last = (arr = []) => arr[arr.length - 1];
|
||||||
|
const noop = Function.prototype;
|
||||||
|
|
||||||
|
function copyFnProps(oldFn, newFn) {
|
||||||
|
Object.keys(oldFn).forEach((key) => {
|
||||||
|
newFn[key] = oldFn[key];
|
||||||
|
});
|
||||||
|
return newFn;
|
||||||
|
}
|
||||||
|
|
||||||
|
function wrap(fn) {
|
||||||
|
const newFn = function newFn(...args) {
|
||||||
|
const ret = fn.apply(this, args);
|
||||||
|
const next = (args.length === 5 ? args[2] : last(args)) || noop;
|
||||||
|
if (ret && ret.catch) ret.catch(err => next(err));
|
||||||
|
return ret;
|
||||||
|
};
|
||||||
|
Object.defineProperty(newFn, 'length', {
|
||||||
|
value: fn.length,
|
||||||
|
writable: false,
|
||||||
|
});
|
||||||
|
return copyFnProps(fn, newFn);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function patchRouterParam() {
|
||||||
|
const originalParam = Router.prototype.constructor.param;
|
||||||
|
Router.prototype.constructor.param = function param(name, fn) {
|
||||||
|
fn = wrap(fn);
|
||||||
|
return originalParam.call(this, name, fn);
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
Object.defineProperty(Layer.prototype, 'handle', {
|
||||||
|
enumerable: true,
|
||||||
|
get() {
|
||||||
|
return this.__handle;
|
||||||
|
},
|
||||||
|
set(fn) {
|
||||||
|
fn = wrap(fn);
|
||||||
|
this.__handle = fn;
|
||||||
|
},
|
||||||
|
});
|
||||||
Reference in New Issue
Block a user