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
10 changes: 8 additions & 2 deletions lib/next.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,17 @@ function next (middlewares, req, res, index, routers, defaultRoute, errorHandler
}

// Call router's lookup method
return middleware.lookup(req, res, step)
const result = middleware.lookup(req, res, step)
return result && typeof result.then === 'function'
? result.catch(err => errorHandler(err, req, res))
: result
}

// Regular middleware function
return middleware(req, res, step)
const result = middleware(req, res, step)
return result && typeof result.then === 'function'
? result.catch(err => errorHandler(err, req, res))
: result
} catch (err) {
return errorHandler(err, req, res)
}
Expand Down
15 changes: 15 additions & 0 deletions tests/router-coverage.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -366,6 +366,21 @@ describe('0http - Router Coverage', () => {
expect(res.error).to.equal('Middleware exception')
})

it('should handle async middleware rejections', async () => {
const req = {}
const res = {}
const middleware = async (req, res, next) => {
throw new Error('Async failure')
}
const defaultRoute = () => {}
const errorHandler = (err, req, res) => {
res.error = err.message
}

await next([middleware], req, res, 0, {}, defaultRoute, errorHandler)
expect(res.error).to.equal('Async failure')
})

it('should handle nested router without pattern', () => {
const req = { url: '/test', path: '/test' }
const res = {}
Expand Down