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
e3e0a68b
Commit
e3e0a68b
authored
Jan 12, 2017
by
Naoyuki Kanezawa
Committed by
Guillermo Rauch
Jan 12, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix handling http methods (#748)
* support HEAD method * respond with 501 if method is not GET or HEAD
parent
1dc52dbc
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
64 additions
and
53 deletions
+64
-53
index.js
server/index.js
+57
-42
render.js
server/render.js
+7
-7
router.js
server/router.js
+0
-4
No files found.
server/index.js
View file @
e3e0a68b
import
{
resolve
,
join
}
from
'path'
import
{
resolve
,
join
}
from
'path'
import
{
parse
}
from
'url'
import
{
parse
}
from
'url'
import
fs
from
'mz/fs'
import
fs
from
'mz/fs'
import
http
from
'http'
import
http
,
{
STATUS_CODES
}
from
'http'
import
{
import
{
renderToHTML
,
renderToHTML
,
renderErrorToHTML
,
renderErrorToHTML
,
...
@@ -38,7 +38,7 @@ export default class Server {
...
@@ -38,7 +38,7 @@ export default class Server {
.
catch
((
err
)
=>
{
.
catch
((
err
)
=>
{
if
(
!
this
.
quiet
)
console
.
error
(
err
)
if
(
!
this
.
quiet
)
console
.
error
(
err
)
res
.
statusCode
=
500
res
.
statusCode
=
500
res
.
end
(
'error'
)
res
.
end
(
STATUS_CODES
[
500
]
)
})
})
}
}
}
}
...
@@ -67,43 +67,52 @@ export default class Server {
...
@@ -67,43 +67,52 @@ export default class Server {
}
}
defineRoutes
()
{
defineRoutes
()
{
this
.
router
.
get
(
'/_next-prefetcher.js'
,
async
(
req
,
res
,
params
)
=>
{
const
routes
=
{
const
p
=
join
(
__dirname
,
'../client/next-prefetcher-bundle.js'
)
'/_next-prefetcher.js'
:
async
(
req
,
res
,
params
)
=>
{
await
serveStatic
(
req
,
res
,
p
)
const
p
=
join
(
__dirname
,
'../client/next-prefetcher-bundle.js'
)
})
await
this
.
serveStatic
(
req
,
res
,
p
)
},
this
.
router
.
get
(
'/_next/:buildId/main.js'
,
async
(
req
,
res
,
params
)
=>
{
this
.
handleBuildId
(
params
.
buildId
,
res
)
'/_next/:buildId/main.js'
:
async
(
req
,
res
,
params
)
=>
{
const
p
=
join
(
this
.
dir
,
'.next/main.js'
)
this
.
handleBuildId
(
params
.
buildId
,
res
)
await
serveStaticWithGzip
(
req
,
res
,
p
)
const
p
=
join
(
this
.
dir
,
'.next/main.js'
)
})
await
this
.
serveStaticWithGzip
(
req
,
res
,
p
)
},
this
.
router
.
get
(
'/_next/:buildId/commons.js'
,
async
(
req
,
res
,
params
)
=>
{
this
.
handleBuildId
(
params
.
buildId
,
res
)
'/_next/:buildId/commons.js'
:
async
(
req
,
res
,
params
)
=>
{
const
p
=
join
(
this
.
dir
,
'.next/commons.js'
)
this
.
handleBuildId
(
params
.
buildId
,
res
)
await
serveStaticWithGzip
(
req
,
res
,
p
)
const
p
=
join
(
this
.
dir
,
'.next/commons.js'
)
})
await
this
.
serveStaticWithGzip
(
req
,
res
,
p
)
},
this
.
router
.
get
(
'/_next/:buildId/pages/:path*'
,
async
(
req
,
res
,
params
)
=>
{
this
.
handleBuildId
(
params
.
buildId
,
res
)
'/_next/:buildId/pages/:path*'
:
async
(
req
,
res
,
params
)
=>
{
const
paths
=
params
.
path
||
[
'index'
]
this
.
handleBuildId
(
params
.
buildId
,
res
)
const
pathname
=
`/
${
paths
.
join
(
'/'
)}
`
const
paths
=
params
.
path
||
[
'index'
]
await
this
.
renderJSON
(
req
,
res
,
pathname
)
const
pathname
=
`/
${
paths
.
join
(
'/'
)}
`
})
await
this
.
renderJSON
(
req
,
res
,
pathname
)
},
this
.
router
.
get
(
'/_next/:path+'
,
async
(
req
,
res
,
params
)
=>
{
const
p
=
join
(
__dirname
,
'..'
,
'client'
,
...(
params
.
path
||
[]))
'/_next/:path+'
:
async
(
req
,
res
,
params
)
=>
{
await
serveStatic
(
req
,
res
,
p
)
const
p
=
join
(
__dirname
,
'..'
,
'client'
,
...(
params
.
path
||
[]))
})
await
this
.
serveStatic
(
req
,
res
,
p
)
this
.
router
.
get
(
'/static/:path+'
,
async
(
req
,
res
,
params
)
=>
{
},
const
p
=
join
(
this
.
dir
,
'static'
,
...(
params
.
path
||
[]))
await
serveStatic
(
req
,
res
,
p
)
'/static/:path+'
:
async
(
req
,
res
,
params
)
=>
{
})
const
p
=
join
(
this
.
dir
,
'static'
,
...(
params
.
path
||
[]))
await
this
.
serveStatic
(
req
,
res
,
p
)
},
'/:path*'
:
async
(
req
,
res
)
=>
{
const
{
pathname
,
query
}
=
parse
(
req
.
url
,
true
)
await
this
.
render
(
req
,
res
,
pathname
,
query
)
}
}
this
.
router
.
get
(
'/:path*'
,
async
(
req
,
res
)
=>
{
for
(
const
method
of
[
'GET'
,
'HEAD'
])
{
const
{
pathname
,
query
}
=
parse
(
req
.
url
,
true
)
for
(
const
p
of
Object
.
keys
(
routes
))
{
await
this
.
render
(
req
,
res
,
pathname
,
query
)
this
.
router
.
add
(
method
,
p
,
routes
[
p
])
})
}
}
}
}
async
start
(
port
)
{
async
start
(
port
)
{
...
@@ -125,8 +134,14 @@ export default class Server {
...
@@ -125,8 +134,14 @@ export default class Server {
const
fn
=
this
.
router
.
match
(
req
,
res
)
const
fn
=
this
.
router
.
match
(
req
,
res
)
if
(
fn
)
{
if
(
fn
)
{
await
fn
()
await
fn
()
}
else
{
return
}
if
(
req
.
method
===
'GET'
||
req
.
method
===
'HEAD'
)
{
await
this
.
render404
(
req
,
res
)
await
this
.
render404
(
req
,
res
)
}
else
{
res
.
statusCode
=
501
res
.
end
(
STATUS_CODES
[
501
])
}
}
}
}
...
@@ -135,7 +150,7 @@ export default class Server {
...
@@ -135,7 +150,7 @@ export default class Server {
res
.
setHeader
(
'X-Powered-By'
,
`Next.js
${
pkg
.
version
}
`
)
res
.
setHeader
(
'X-Powered-By'
,
`Next.js
${
pkg
.
version
}
`
)
}
}
const
html
=
await
this
.
renderToHTML
(
req
,
res
,
pathname
,
query
)
const
html
=
await
this
.
renderToHTML
(
req
,
res
,
pathname
,
query
)
sendHTML
(
res
,
html
)
sendHTML
(
res
,
html
,
req
.
method
)
}
}
async
renderToHTML
(
req
,
res
,
pathname
,
query
)
{
async
renderToHTML
(
req
,
res
,
pathname
,
query
)
{
...
@@ -163,7 +178,7 @@ export default class Server {
...
@@ -163,7 +178,7 @@ export default class Server {
async
renderError
(
err
,
req
,
res
,
pathname
,
query
)
{
async
renderError
(
err
,
req
,
res
,
pathname
,
query
)
{
const
html
=
await
this
.
renderErrorToHTML
(
err
,
req
,
res
,
pathname
,
query
)
const
html
=
await
this
.
renderErrorToHTML
(
err
,
req
,
res
,
pathname
,
query
)
sendHTML
(
res
,
html
)
sendHTML
(
res
,
html
,
req
.
method
)
}
}
async
renderErrorToHTML
(
err
,
req
,
res
,
pathname
,
query
)
{
async
renderErrorToHTML
(
err
,
req
,
res
,
pathname
,
query
)
{
...
@@ -191,7 +206,7 @@ export default class Server {
...
@@ -191,7 +206,7 @@ export default class Server {
async
render404
(
req
,
res
)
{
async
render404
(
req
,
res
)
{
const
{
pathname
,
query
}
=
parse
(
req
.
url
,
true
)
const
{
pathname
,
query
}
=
parse
(
req
.
url
,
true
)
res
.
statusCode
=
404
res
.
statusCode
=
404
this
.
renderError
ToHTML
(
null
,
req
,
res
,
pathname
,
query
)
this
.
renderError
(
null
,
req
,
res
,
pathname
,
query
)
}
}
async
renderJSON
(
req
,
res
,
page
)
{
async
renderJSON
(
req
,
res
,
page
)
{
...
...
server/render.js
View file @
e3e0a68b
...
@@ -14,7 +14,7 @@ import App from '../lib/app'
...
@@ -14,7 +14,7 @@ import App from '../lib/app'
export
async
function
render
(
req
,
res
,
pathname
,
query
,
opts
)
{
export
async
function
render
(
req
,
res
,
pathname
,
query
,
opts
)
{
const
html
=
await
renderToHTML
(
req
,
res
,
pathname
,
opts
)
const
html
=
await
renderToHTML
(
req
,
res
,
pathname
,
opts
)
sendHTML
(
res
,
html
)
sendHTML
(
res
,
html
,
req
.
method
)
}
}
export
function
renderToHTML
(
req
,
res
,
pathname
,
query
,
opts
)
{
export
function
renderToHTML
(
req
,
res
,
pathname
,
query
,
opts
)
{
...
@@ -23,7 +23,7 @@ export function renderToHTML (req, res, pathname, query, opts) {
...
@@ -23,7 +23,7 @@ export function renderToHTML (req, res, pathname, query, opts) {
export
async
function
renderError
(
err
,
req
,
res
,
pathname
,
query
,
opts
)
{
export
async
function
renderError
(
err
,
req
,
res
,
pathname
,
query
,
opts
)
{
const
html
=
await
renderErrorToHTML
(
err
,
req
,
res
,
query
,
opts
)
const
html
=
await
renderErrorToHTML
(
err
,
req
,
res
,
query
,
opts
)
sendHTML
(
res
,
html
)
sendHTML
(
res
,
html
,
req
.
method
)
}
}
export
function
renderErrorToHTML
(
err
,
req
,
res
,
pathname
,
query
,
opts
=
{})
{
export
function
renderErrorToHTML
(
err
,
req
,
res
,
pathname
,
query
,
opts
=
{})
{
...
@@ -111,24 +111,24 @@ export async function renderErrorJSON (err, req, res, { dir = process.cwd(), dev
...
@@ -111,24 +111,24 @@ export async function renderErrorJSON (err, req, res, { dir = process.cwd(), dev
sendJSON
(
res
,
{
sendJSON
(
res
,
{
component
,
component
,
err
:
err
&&
dev
?
errorToJSON
(
err
)
:
null
err
:
err
&&
dev
?
errorToJSON
(
err
)
:
null
})
}
,
req
.
method
)
}
}
export
function
sendHTML
(
res
,
html
)
{
export
function
sendHTML
(
res
,
html
,
method
)
{
if
(
res
.
finished
)
return
if
(
res
.
finished
)
return
res
.
setHeader
(
'Content-Type'
,
'text/html'
)
res
.
setHeader
(
'Content-Type'
,
'text/html'
)
res
.
setHeader
(
'Content-Length'
,
Buffer
.
byteLength
(
html
))
res
.
setHeader
(
'Content-Length'
,
Buffer
.
byteLength
(
html
))
res
.
end
(
html
)
res
.
end
(
method
===
'HEAD'
?
null
:
html
)
}
}
export
function
sendJSON
(
res
,
obj
)
{
export
function
sendJSON
(
res
,
obj
,
method
)
{
if
(
res
.
finished
)
return
if
(
res
.
finished
)
return
const
json
=
JSON
.
stringify
(
obj
)
const
json
=
JSON
.
stringify
(
obj
)
res
.
setHeader
(
'Content-Type'
,
'application/json'
)
res
.
setHeader
(
'Content-Type'
,
'application/json'
)
res
.
setHeader
(
'Content-Length'
,
Buffer
.
byteLength
(
json
))
res
.
setHeader
(
'Content-Length'
,
Buffer
.
byteLength
(
json
))
res
.
end
(
json
)
res
.
end
(
method
===
'HEAD'
?
null
:
json
)
}
}
function
errorToJSON
(
err
)
{
function
errorToJSON
(
err
)
{
...
...
server/router.js
View file @
e3e0a68b
...
@@ -8,10 +8,6 @@ export default class Router {
...
@@ -8,10 +8,6 @@ export default class Router {
this
.
routes
=
new
Map
()
this
.
routes
=
new
Map
()
}
}
get
(
path
,
fn
)
{
this
.
add
(
'GET'
,
path
,
fn
)
}
add
(
method
,
path
,
fn
)
{
add
(
method
,
path
,
fn
)
{
const
routes
=
this
.
routes
.
get
(
method
)
||
new
Set
()
const
routes
=
this
.
routes
.
get
(
method
)
||
new
Set
()
routes
.
add
({
match
:
route
(
path
),
fn
})
routes
.
add
({
match
:
route
(
path
),
fn
})
...
...
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