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
4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@
"typescript": "^2.4.2"
},
"dependencies": {
"array-flatten": "^2.1.0"
"@types/debug": "0.0.29",
"array-flatten": "^2.1.0",
"debug": "^2.6.8"
}
}
21 changes: 13 additions & 8 deletions src/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
import debug = require('debug')
import flatten = require('array-flatten')

const log = debug('compose-middleware')

export type Callback = (err?: Error) => any
export type RequestHandler = (req?: any, res?: any, next?: Callback) => any
export type ErrorHandler = (err?: Error, req?: any, res?: any, next?: Callback) => any
Expand Down Expand Up @@ -34,21 +37,19 @@ export function errors (...handlers: Handler[]): ErrorHandler {
let index = -1

function dispatch (pos: number, err?: Error): void {
if (pos <= index) {
throw new TypeError('`next()` called multiple times')
}

index = pos

if (index === stack.length) {
return done(err)
}

function next (err?: Error) {
return dispatch(pos + 1, err)
}
return handle(stack[pos], err, req, res, function next (err?: Error) {
if (pos < index) {
throw new TypeError('`next()` called multiple times')
}

return handle(stack[pos], err, req, res, next)
return dispatch(pos + 1, err)
})
}

return dispatch(0, err)
Expand All @@ -59,6 +60,8 @@ export function errors (...handlers: Handler[]): ErrorHandler {
* Wrap middleware handling in a `try..catch` which forwards errors.
*/
function handle (handler: Middleware, err: Error, req: any, res: any, next: Callback) {
log('handle', (handler as any).name || '<anonymous>')

try {
if (handler.length === 4) {
if (err) {
Expand All @@ -74,6 +77,8 @@ function handle (handler: Middleware, err: Error, req: any, res: any, next: Call

return (handler as RequestHandler)(req, res, next)
} catch (err) {
log('try..catch', err)

return next(err)
}
}