From dd8df34574a1c0bd3431a1df3cb393efeafde3fe Mon Sep 17 00:00:00 2001
From: MICHAEL JACKSON <mjijackson@gmail.com>
Date: Sat, 26 Aug 2017 20:38:31 -0700
Subject: [PATCH] Revert to custom file sending logic

---
 package.json                   |  1 +
 server/middleware/serveFile.js | 52 ++++++++++++++++++++++------------
 yarn.lock                      |  2 +-
 3 files changed, 36 insertions(+), 19 deletions(-)

diff --git a/package.json b/package.json
index cba79a0..30c2eaa 100644
--- a/package.json
+++ b/package.json
@@ -14,6 +14,7 @@
     "countries-list": "^1.3.2",
     "csso": "^3.1.1",
     "date-fns": "^1.28.1",
+    "etag": "^1.8.0",
     "express": "^4.15.2",
     "gunzip-maybe": "^1.4.0",
     "invariant": "^2.2.2",
diff --git a/server/middleware/serveFile.js b/server/middleware/serveFile.js
index 204bc0e..a48db71 100644
--- a/server/middleware/serveFile.js
+++ b/server/middleware/serveFile.js
@@ -1,5 +1,6 @@
 const fs = require('fs')
 const path = require('path')
+const etag = require('etag')
 const babel = require('babel-core')
 const unpkgRewrite = require('babel-plugin-unpkg-rewrite')
 const getMetadata = require('./utils/getMetadata')
@@ -35,6 +36,7 @@ const FileTransforms = {
  */
 function serveFile(req, res, next) {
   if (req.query.meta != null) {
+    // Serve JSON metadata.
     getMetadata(req.packageDir, req.filename, req.stats, MaximumDepth, function (error, metadata) {
       if (error) {
         console.error(error)
@@ -48,6 +50,7 @@ function serveFile(req, res, next) {
       }
     })
   } else if (req.stats.isFile()) {
+    // Serve a file.
     const file = path.join(req.packageDir, req.filename)
 
     let contentType = getFileContentType(file)
@@ -55,13 +58,8 @@ function serveFile(req, res, next) {
     if (contentType === 'text/html')
       contentType = 'text/plain' // We can't serve HTML because bad people :(
 
-    // Cache files for 1 year.
-    res.set({
-      'Content-Type': contentType,
-      'Cache-Control': 'public, max-age=31536000'
-    })
-
     if (contentType === 'application/javascript' && req.query.module != null) {
+      // Serve a JavaScript module.
       const dependencies = Object.assign({},
         req.packageConfig.peerDependencies,
         req.packageConfig.dependencies
@@ -72,28 +70,46 @@ function serveFile(req, res, next) {
           console.error(error)
           res.status(500).type('text').send(`Cannot generate index page for ${req.packageSpec}${req.filename}`)
         } else {
+          // Cache modules for 1 year.
           res.set({
-            'Cache-Tag': 'file,module'
+            'Content-Type': contentType,
+            'Content-Length': Buffer.byteLength(code),
+            'Cache-Control': 'public, max-age=31536000',
+            'Cache-Tag': 'file,js-file,js-module'
           }).send(code)
         }
       })
     } else {
-      const options = {
-        dotfiles: 'allow'
-      }
+      // Serve some other static file.
+      const tags = [ 'file' ]
 
+      const ext = path.extname(req.filename).substr(1)
+
+      if (ext)
+        tags.push(`${ext}-file`)
+
+      // Cache files for 1 year.
       res.set({
-        'Cache-Tag': 'file'
-      }).sendFile(file, options, function (error) {
-        if (error) {
-          console.error(`Cannot send file ${req.packageSpec}${req.filename}`)
-          console.error(error)
-          // res.status(500).type('text').send(`Cannot send file ${req.packageSpec}${req.filename}`)
-          res.sendStatus(500)
-        }
+        'Content-Type': contentType,
+        'Content-Length': req.stats.size,
+        'Cache-Control': 'public, max-age=31536000',
+        'Last-Modified': req.stats.mtime.toUTCString(),
+        'ETag': etag(req.stats),
+        'Cache-Tag': tags.join(',')
       })
+
+      const stream = fs.createReadStream(file)
+
+      stream.on('error', function (error) {
+        console.error(`Cannot send file ${req.packageSpec}${req.filename}`)
+        console.error(error)
+        res.sendStatus(500)
+      })
+
+      stream.pipe(res)
     }
   } else if (AutoIndex && req.stats.isDirectory()) {
+    // Serve an HTML directory listing.
     getIndexHTML(req.packageInfo, req.packageVersion, req.packageDir, req.filename, function (error, html) {
       if (error) {
         console.error(error)
diff --git a/yarn.lock b/yarn.lock
index 3dbaeb9..106660e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1983,7 +1983,7 @@ esutils@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"
 
-etag@~1.8.0:
+etag@^1.8.0, etag@~1.8.0:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.0.tgz#6f631aef336d6c46362b51764044ce216be3c051"