terribleplan/next.js
1
0
Fork 0
mirror of https://github.com/terribleplan/next.js.git synced 2024-01-19 02:48:18 +00:00
Code Issues Releases Wiki Activity

Check the existence of the gzipped path explicitly (#704)

Browse source 
* Check the existance of the gzipped path explicitely.

* Fix a typo in the comments.

* Fix a typo.
This commit is contained in:
Arunoda Susiripala 2017-01-08 19:01:25 -08:00 committed by Guillermo Rauch
parent 88e4adfc2a
commit d7eac7fa2c
1 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
server/render.js
View file

@ -2,6 +2,7 @@ import { join } from 'path'
import { createElement } from 'react' import { createElement } from 'react'
import { renderToString, renderToStaticMarkup } from 'react-dom/server' import { renderToString, renderToStaticMarkup } from 'react-dom/server'
import send from 'send' import send from 'send'
import fs from 'mz/fs'
import accepts from 'accepts' import accepts from 'accepts'
import mime from 'mime-types' import mime from 'mime-types'
import requireModule from './require' import requireModule from './require'
@ -148,19 +149,29 @@ export async function serveStaticWithGzip (req, res, path) {
return serveStatic(req, res, path) return serveStatic(req, res, path)
} }
const gzipPath = `${path}.gz`
try { try {
const gzipPath = `${path}.gz` // We need to check the existance of the gzipPath.
const contentType = mime.lookup(path) || 'application/octet-stream' // Getting `ENOENT` error from the `serveStatic` is inconsistent and
res.setHeader('Content-Type', contentType) // didn't work on all the cases.
res.setHeader('Content-Encoding', 'gzip') //
await serveStatic(req, res, gzipPath) // And this won't give us a race condition because we know that
// we don't add gzipped files at runtime.
await fs.stat(gzipPath)
} catch (ex) { } catch (ex) {
if (ex.code === 'ENOENT') { if (ex.code === 'ENOENT') {
res.removeHeader('Content-Encoding') // Seems like there's no gzipped file. Let's serve the uncompressed file.
return serveStatic(req, res, path) return serveStatic(req, res, path)
} }
throw ex throw ex
} }
const contentType = mime.lookup(path) || 'application/octet-stream'
res.setHeader('Content-Type', contentType)
res.setHeader('Content-Encoding', 'gzip')
return serveStatic(req, res, gzipPath)
} }
export function serveStatic (req, res, path) { export function serveStatic (req, res, path) {