Commit 897c60b4 authored by Naoyuki Kanezawa's avatar Naoyuki Kanezawa Committed by Guillermo Rauch

Fix error routes (#595)

* fix router error handlings

* respond with JSON when error occurs on JSON routes
parent 08548551
...@@ -50,16 +50,19 @@ export default class Router extends EventEmitter { ...@@ -50,16 +50,19 @@ export default class Router extends EventEmitter {
error error
} = await this.getRouteInfo(route, pathname, query) } = await this.getRouteInfo(route, pathname, query)
if (error) { if (error && error.cancelled) {
this.emit('routeChangeError', error, as) this.emit('routeChangeError', error, as)
// We don't need to throw here since the error is already logged by
// this.getRouteInfo
return return
} }
this.route = route this.route = route
this.set(pathname, query, { ...data, props }) this.set(pathname, query, { ...data, props })
this.emit('routeChangeComplete', as)
if (error) {
this.emit('routeChangeError', error, as)
} else {
this.emit('routeChangeComplete', as)
}
} }
update (route, Component) { update (route, Component) {
...@@ -87,13 +90,18 @@ export default class Router extends EventEmitter { ...@@ -87,13 +90,18 @@ export default class Router extends EventEmitter {
error error
} = await this.getRouteInfo(route, pathname, query) } = await this.getRouteInfo(route, pathname, query)
if (error) { if (error && error.cancelled) {
this.emit('routeChangeError', error, url) this.emit('routeChangeError', error, url)
throw error return
} }
this.notify({ ...data, props }) this.notify({ ...data, props })
if (error) {
this.emit('routeChangeError', error, url)
throw error
}
this.emit('routeChangeComplete', url) this.emit('routeChangeComplete', url)
} }
...@@ -127,9 +135,9 @@ export default class Router extends EventEmitter { ...@@ -127,9 +135,9 @@ export default class Router extends EventEmitter {
data, props, error data, props, error
} = await this.getRouteInfo(route, pathname, query) } = await this.getRouteInfo(route, pathname, query)
if (error) { if (error && error.cancelled) {
this.emit('routeChangeError', error, as) this.emit('routeChangeError', error, as)
throw error return false
} }
changeState() changeState()
...@@ -137,6 +145,11 @@ export default class Router extends EventEmitter { ...@@ -137,6 +145,11 @@ export default class Router extends EventEmitter {
this.route = route this.route = route
this.set(pathname, query, { ...data, props }) this.set(pathname, query, { ...data, props })
if (error) {
this.emit('routeChangeError', error, as)
throw error
}
this.emit('routeChangeComplete', as) this.emit('routeChangeComplete', as)
return true return true
......
...@@ -213,6 +213,30 @@ export default class Server { ...@@ -213,6 +213,30 @@ export default class Server {
return renderErrorJSON(err, req, res, this.renderOpts) return renderErrorJSON(err, req, res, this.renderOpts)
} }
async serveStaticWithGzip (req, res, path) {
this._serveStatic(req, res, () => {
return serveStaticWithGzip(req, res, path)
})
}
serveStatic (req, res, path) {
this._serveStatic(req, res, () => {
return serveStatic(req, res, path)
})
}
async _serveStatic (req, res, fn) {
try {
await fn()
} catch (err) {
if (err.code === 'ENOENT') {
this.render404(req, res)
} else {
throw err
}
}
}
getCompilationError (page) { getCompilationError (page) {
if (!this.hotReloader) return if (!this.hotReloader) return
......
...@@ -169,15 +169,7 @@ export async function serveStaticWithGzip (req, res, path) { ...@@ -169,15 +169,7 @@ export async function serveStaticWithGzip (req, res, path) {
export function serveStatic (req, res, path) { export function serveStatic (req, res, path) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
send(req, path) send(req, path)
.on('error', (err) => { .on('error', reject)
if (err.code === 'ENOENT') {
res.statusCode = 404
res.end('Not Found')
resolve()
} else {
reject(err)
}
})
.pipe(res) .pipe(res)
.on('finish', resolve) .on('finish', resolve)
}) })
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment