Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
N
next.js
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Alex
next.js
Commits
897c60b4
Commit
897c60b4
authored
Jan 01, 2017
by
Naoyuki Kanezawa
Committed by
Guillermo Rauch
Jan 01, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix error routes (#595)
* fix router error handlings * respond with JSON when error occurs on JSON routes
parent
08548551
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
46 additions
and
17 deletions
+46
-17
router.js
lib/router/router.js
+21
-8
index.js
server/index.js
+24
-0
render.js
server/render.js
+1
-9
No files found.
lib/router/router.js
View file @
897c60b4
...
@@ -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
...
...
server/index.js
View file @
897c60b4
...
@@ -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
...
...
server/render.js
View file @
897c60b4
...
@@ -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
)
})
})
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment