st 1.1.0 → 2.0.0

package/test/gzip-after-no-gzip.js

@@ -2,18 +2,12 @@ global.options = {
   cachedHeader: true // inspect to see if something is served from cache
 }
 
-var zlib = require('zlib')
-var common = require('./common.js')
-var req = common.req
-var stExpect = common.stExpect
-
-var test = require('tap').test
-
-
-test('does not gzip first response', function(t) {
-  req('/test/st.js', {'accept-encoding':'none'},
-      function (er, res, body) {
+const zlib = require('zlib')
+const { req, stExpect } = require('./common.js')
+const { test } = require('tap')
 
+test('does not gzip first response', (t) => {
+  req('/test/st.js', { 'accept-encoding': 'none' }, (er, res, body) => {
     t.equal(res.statusCode, 200)
     t.notOk(res.headers['content-encoding'])
     t.notOk(res.headers['x-from-cache'])
@@ -22,12 +16,9 @@ test('does not gzip first response', function(t) {
   })
 })
 
-
-test('gzips second response', function (t) {
-  req('/test/st.js', {'accept-encoding':'gzip'},
-      function (er, res, body) {
-
-    t.ifError(er, 'no error')
+test('gzips second response', (t) => {
+  req('/test/st.js', { 'accept-encoding': 'gzip' }, (er, res, body) => {
+    t.error(er, 'no error')
 
     t.equal(res.statusCode, 200)
     t.equal(res.headers['content-encoding'], 'gzip')
@@ -36,8 +27,10 @@ test('gzips second response', function (t) {
     t.ok(body, 'returned a body')
     t.notEqual(body.toString(), stExpect, 'gzipped string')
 
-    zlib.gunzip(body, function (er, body) {
-      if (er) throw er
+    zlib.gunzip(body, (er, body) => {
+      if (er) {
+        throw er
+      }
       t.equal(body.toString(), stExpect)
       t.end()
     })

package/test/middleware.js

@@ -1,23 +1,17 @@
-var st = require('../st.js')
-var test = require('tap').test
-var port = process.env.PORT || 1337
-var util = require('util')
-var path = require('path')
+const st = require('../st.js')
+const { test } = require('tap')
+const path = require('path')
 
-var opts = util._extend({
+const opts = Object.assign({
   autoindex: true,
   path: path.dirname(__dirname),
   url: '/test'
 }, global.options || {})
 
-var mount = st(opts)
+const mount = st(opts)
 
-test('call next() if asset not found', function (t) {
-  var req = { url: '/does-not-exist?a=b' }
-  var res = {}
+test('call next() if asset not found', (t) => {
+  const req = { url: '/does-not-exist?a=b' }
   t.plan(1)
-  function next() {
-    t.equal(req.url, '/does-not-exist?a=b')
-  }
-  mount(req, req, next)
+  mount(req, req, () => t.equal(req.url, '/does-not-exist?a=b'))
 })

package/test/multi-mount.js

@@ -1,16 +1,17 @@
-var st = require('../st.js')
-var test = require('tap').test
-var port = process.env.PORT || 1337
-var path = require('path')
-var request = require('request')
-var middlewareServer
-var server
-var assert = require('assert')
-var fs = require('fs')
-var http = require('http')
+const st = require('../st.js')
+const test = require('tap').test
+const port = process.env.PORT || 1337
+const path = require('path')
+const request = require('request')
+const assert = require('assert')
+const fs = require('fs')
+const http = require('http')
+
+let middlewareServer
+let server
 
 // mount the dirname on the /test url
-var mount1 = st({
+const mount1 = st({
   autoindex: true,
   path: path.dirname(__dirname),
   url: '/test',
@@ -22,7 +23,7 @@ var mount1 = st({
 })
 
 // mount the test dir on the /blerg url
-var mount2 = st({
+const mount2 = st({
   autoindex: true,
   path: __dirname,
   url: '/blerg',
@@ -34,36 +35,45 @@ var mount2 = st({
 })
 
 function req (url, headers, cb) {
-  if (typeof headers === 'function')
-    cb = headers, headers = {}
-
-  var reqs = 0
-  var errState = null
-  var prev = null
-
-  request({ encoding: null,
-            url: 'http://localhost:' + port + url,
-            headers: headers,
-            agentOptions: { maxSockets: 50 } }, next)
-  request({ encoding: null,
-            url: 'http://localhost:' + (port + 1) + url,
-            headers: headers,
-            agentOptions: { maxSockets: 50 } }, next)
+  if (typeof headers === 'function') {
+    cb = headers
+    headers = {}
+  }
+
+  let reqs = 0
+  let errState = null
+  let prev = null
+
+  request({
+    encoding: null,
+    url: `http://localhost:${port}${url}`,
+    headers: headers,
+    agentOptions: { maxSockets: 50 }
+  }, next)
+  request({
+    encoding: null,
+    url: `http://localhost:${(port + 1)}${url}`,
+    headers: headers,
+    agentOptions: { maxSockets: 50 }
+  }, next)
 
   function next (er, res, body) {
-    if (errState)
+    if (errState) {
       return
-    if (er)
-      return cb(errState = er, res, body)
+    }
+    if (er) {
+      errState = er
+      return cb(er, res, body)
+    }
     if (++reqs === 2) {
-      assert.equal(res.statusCode, prev.res.statusCode)
+      assert.strictEqual(res.statusCode, prev.res.statusCode)
       // compare dates, they should be approximately the same
       assert(Math.abs(new Date(res.headers.date).getTime() -
                       new Date(res.headers.date).getTime()) < 1000)
       // compare the headers minus the 'date' value
       res.headers.date = prev.res.headers.date = null
-      assert.deepEqual(res.headers, prev.res.headers)
-      assert.equal('' + body, '' + prev.body)
+      assert.deepStrictEqual(res.headers, prev.res.headers)
+      assert.strictEqual(`${body}`, `${prev.body}`)
       return cb(er, res, body)
     }
     prev = { res: res, body: body }
@@ -76,7 +86,7 @@ test('setup middleware server', function (t) {
     mount1(req, res, function () {
       mount2(req, res, function () {
         res.statusCode = 404
-        return res.end('Not a match: ' + req.url)
+        return res.end(`Not a match: ${req.url}`)
       })
     })
   })
@@ -90,7 +100,7 @@ test('setup regular server', function (t) {
   server = http.createServer(function (req, res) {
     if (!mount1(req, res) && !mount2(req, res)) {
       res.statusCode = 404
-      return res.end('Not a match: ' + req.url)
+      return res.end(`Not a match: ${req.url}`)
     }
   })
   server.listen(port + 1, '127.0.0.1', function () {
@@ -99,9 +109,9 @@ test('setup regular server', function (t) {
   })
 })
 
+let stEtag
+const stExpect = fs.readFileSync(require.resolve('../st.js')).toString()
 
-var stEtag
-var stExpect = fs.readFileSync(require.resolve('../st.js')).toString()
 test('/test/st.js', function (t) {
   req('/test/st.js', function (er, res, body) {
     t.equal(res.statusCode, 200)
@@ -113,15 +123,15 @@ test('/test/st.js', function (t) {
 })
 
 test('/test/st.js 304', function (t) {
-  req('/test/st.js', {'if-none-match':stEtag}, function (er, res, body) {
+  req('/test/st.js', { 'if-none-match': stEtag }, function (er, res, body) {
     t.equal(res.statusCode, 304)
     t.equal(body.length, 0)
     t.end()
   })
 })
 
-var mmEtag
-var mmExpect = fs.readFileSync(__filename, 'utf8')
+let mmEtag
+const mmExpect = fs.readFileSync(__filename, 'utf8')
 test('/blerg/multi-mount.js', function (t) {
   req('/blerg/multi-mount.js', function (er, res, body) {
     t.equal(res.statusCode, 200)
@@ -141,93 +151,100 @@ test('/test/test/multi-mount.js', function (t) {
   })
 })
 
-
-var rmEtag
-var rmExpect = fs.readFileSync(path.resolve(__dirname, '../README.md'), 'utf8')
-var pjEtag
-var pjExpect = fs.readFileSync(path.resolve(__dirname, '../package.json'), 'utf8')
-var idEtag
-var idExpect = fs.readFileSync(__dirname + '/fixtures/index.html', 'utf8')
-test('just get a few more etags', function(t) {
-  var n = 3
+let rmEtag
+const rmExpect = fs.readFileSync(path.resolve(__dirname, '../README.md'), 'utf8')
+let pjEtag
+const pjExpect = fs.readFileSync(path.resolve(__dirname, '../package.json'), 'utf8')
+let idEtag
+const idExpect = fs.readFileSync(path.join(__dirname, '/fixtures/index.html'), 'utf8')
+test('just get a few more etags', function (t) {
+  let n = 3
 
   req('/test/package.json', function (er, res, body) {
-    if (er)
+    if (er) {
       throw er
+    }
     t.equal(body.toString(), pjExpect)
     pjEtag = res.headers.etag
-    if (--n === 0)
+    if (--n === 0) {
       t.end()
+    }
   })
 
   req('/test/README.md', function (er, res, body) {
-    if (er)
+    if (er) {
       throw er
+    }
     t.equal(body.toString(), rmExpect)
     rmEtag = res.headers.etag
-    if (--n === 0)
+    if (--n === 0) {
       t.end()
+    }
   })
 
   req('/test/test/fixtures/index.html', function (er, res, body) {
-    if (er)
+    if (er) {
       throw er
+    }
     t.equal(body.toString(), idExpect)
     idEtag = res.headers.etag
-    if (--n === 0)
+    if (--n === 0) {
       t.end()
+    }
   })
 })
 
 test('many parallel requests', function (t) {
-  var n = 50
-  var reqs =
-    [ ['/test/test/multi-mount.js', mmEtag, mmExpect],
+  const n = 50
+  const reqs =
+    [['/test/test/multi-mount.js', mmEtag, mmExpect],
       ['/blerg/multi-mount.js', mmEtag, mmExpect],
       ['/test/st.js', stEtag, stExpect],
       ['/test/README.md', rmEtag, rmExpect],
       ['/test/package.json', pjEtag, pjExpect],
       ['/test/test/fixtures/index.html', idEtag, idExpect],
-      ['/blerg/fixtures/index.html', idEtag, idExpect] ]
+      ['/blerg/fixtures/index.html', idEtag, idExpect]]
 
-  var total = n * reqs.length
+  let total = n * reqs.length
 
-  for (var i = 0; i < n; i ++) {
+  for (let i = 0; i < n; i++) {
     reqs.forEach(function (r) {
       req(r[0], next(r))
     })
   }
 
-  function next (r) { return function (er, res, body) {
-    if (er) {
-      console.error('problem with', r[0])
-      throw er
+  function next (r) {
+    return (er, res, body) => {
+      if (er) {
+        console.error('problem with', r[0])
+        throw er
+      }
+
+      t.pass(r[0])
+      t.ok(res)
+      t.ok(res.headers)
+      t.equal(res.headers.etag, r[1])
+      t.equal(body.toString(), r[2].toString())
+
+      if (--total === 0) {
+        process.nextTick(() => {
+          t.ok(require('fd')._totalOpenFds <= 6) // max of 3 fds per mount
+          t.end()
+        })
+      }
     }
-
-    t.pass(r[0])
-    t.ok(res)
-    t.ok(res.headers)
-    t.equal(res.headers.etag, r[1])
-    t.equal(body.toString(), r[2].toString())
-
-    if (--total === 0) {
-      process.nextTick(function () {
-        t.ok(require('fd')._totalOpenFds <= 6) // max of 3 fds per mount
-        t.end()
-      })
-    }
-  }}
+  }
 })
 
-test('shutdown regular server', function (t) {
-  server.close(function () {
+test('shutdown regular server', (t) => {
+  server.close(() => {
     t.pass('closed')
     t.end()
   })
 })
 
-test('shutdown middleware server', function (t) {
-  middlewareServer.close(function () {
+test('shutdown middleware server', (t) => {
+  middlewareServer.close(() => {
     t.pass('closed')
     t.end()
   })

package/test/no-cache.js

@@ -4,18 +4,16 @@ global.options = {
 }
 
 // otherwise just the same as basic.
-var basic = require('./basic.js')
-var req = basic.req
-var mount = basic.mount
+const { mount } = require('./basic.js')
+const { test } = require('tap')
 
 // additional tests to ensure that it's actually not caching.
-var test = require('tap').test
 
-test('all caches should be empty', function(t) {
-  t.same(mount._this.cache.fd._cache.dump(), {})
-  t.same(mount._this.cache.stat._cache.dump(), {})
-  t.same(mount._this.cache.index._cache.dump(), {})
-  t.same(mount._this.cache.readdir._cache.dump(), {})
-  t.same(mount._this.cache.content._cache.dump(), {})
+test('all caches should be empty', (t) => {
+  t.same(mount._this.cache.fd._cache.dump(), [])
+  t.same(mount._this.cache.stat._cache.dump(), [])
+  t.same(mount._this.cache.index._cache.dump(), [])
+  t.same(mount._this.cache.readdir._cache.dump(), [])
+  t.same(mount._this.cache.content._cache.dump(), [])
   t.end()
 })

package/test/no-cors.js

@@ -2,14 +2,13 @@ global.options = {
   cors: false
 }
 
-var common = require('./common')
-
-var test = require('tap').test
-var req = common.req
+const { req } = require('./common')
+const test = require('tap').test
 
 test('without CORS headers', function (t) {
   req('/test/st.js', function (er, res) {
+    t.error(er)
     t.notOk(res.headers['access-control-allow-origin'])
-    t.end();
+    t.end()
   })
 })

package/test/no-gzip-accepted-no-cache.js

@@ -2,33 +2,27 @@ global.options = {
   cache: false // cache invokes a separate path
 }
 
-var fs = require('fs')
-var path = require('path')
-var crypto = require('crypto')
-var rimraf = require('rimraf')
-var common = require('./common.js')
-var req = common.req
-var mount = common.mount
-var stExpect = common.stExpect
-
-var test = require('tap').test
-var testFileName = 'bigfattestfile'
-var testFile = path.join(__dirname, '../', testFileName)
-
-var rndData = crypto.randomBytes(1024 * 128).toString('hex') // significantly larger than highWaterMark
-
-
-test('does not gzip the response', function(t) {
-  t.on('end', function () {
-    rimraf(testFile, function () {})
+const fs = require('fs')
+const path = require('path')
+const crypto = require('crypto')
+const rimraf = require('rimraf')
+const { test } = require('tap')
+const { req } = require('./common.js')
+const testFileName = 'no-gzip-accepted-no-cache.testfile'
+const testFile = path.join(__dirname, '../', testFileName)
+
+const rndData = crypto.randomBytes(1024 * 128).toString('hex') // significantly larger than highWaterMark
+
+test('does not gzip the response', (t) => {
+  t.on('end', () => {
+    rimraf(testFile, () => {})
   })
 
-  fs.writeFile(testFile, rndData, function (err) {
-    t.notOk(err)
-
-    req('/test/' + testFileName, {'accept-encoding':'none'},
-        function (er, res, body) {
+  fs.writeFile(testFile, rndData, (err) => {
+    t.error(err)
 
+    req(`/test/${testFileName}`, { 'accept-encoding': 'none' }, (er, res, body) => {
+      t.error(er)
       t.equal(res.statusCode, 200)
       t.notOk(res.headers['content-encoding'])
       t.equal(body.toString(), rndData)
@@ -36,4 +30,3 @@ test('does not gzip the response', function(t) {
     })
   })
 })
-

package/test/no-gzip-accepted.js

@@ -1,32 +1,27 @@
 global.options = {
 }
 
-var fs = require('fs')
-var path = require('path')
-var crypto = require('crypto')
-var rimraf = require('rimraf')
-var common = require('./common.js')
-var req = common.req
-var mount = common.mount
-var stExpect = common.stExpect
-
-var test = require('tap').test
-var testFileName = 'bigfattestfile'
-var testFile = path.join(__dirname, '../', testFileName)
-
-var rndData = crypto.randomBytes(1024 * 128).toString('hex') // significantly larger than highWaterMark
-
-test('does not gzip the response', function(t) {
-  t.on('end', function () {
-    rimraf(testFile, function () {})
+const fs = require('fs')
+const path = require('path')
+const crypto = require('crypto')
+const rimraf = require('rimraf')
+const { test } = require('tap')
+const { req } = require('./common.js')
+const testFileName = 'no-gzip-accepted.testfile'
+const testFile = path.join(__dirname, '../', testFileName)
+
+const rndData = crypto.randomBytes(1024 * 128).toString('hex') // significantly larger than highWaterMark
+
+test('does not gzip the response', (t) => {
+  t.on('end', () => {
+    rimraf(testFile, () => {})
   })
 
-  fs.writeFile(testFile, rndData, function (err) {
-    t.notOk(err)
-
-    req('/test/' + testFileName, {'accept-encoding':'none'},
-        function (er, res, body) {
+  fs.writeFile(testFile, rndData, (err) => {
+    t.error(err)
 
+    req('/test/' + testFileName, { 'accept-encoding': 'none' }, (er, res, body) => {
+      t.error(er)
       t.equal(res.statusCode, 200)
       t.notOk(res.headers['content-encoding'])
       t.equal(body.toString(), rndData)
@@ -34,4 +29,3 @@ test('does not gzip the response', function(t) {
     })
   })
 })
-

package/test/no-gzip.js

@@ -3,21 +3,16 @@ global.options = {
   gzip: false
 }
 
-var basic = require('./basic.js')
-var req = basic.req
-var mount = basic.mount
-var stExpect = basic.stExpect
+const { test } = require('tap')
+const { req, stExpect } = require('./basic.js')
 
 // additional test to ensure that it's actually not gzipping
-var test = require('tap').test
 
-test('does not gzip the response', function(t) {
-  req('/test/st.js', {'accept-encoding':'gzip'},
-      function (er, res, body) {
+test('does not gzip the response', (t) => {
+  req('/test/st.js', { 'accept-encoding': 'gzip' }, (er, res, body) => {
     t.equal(res.statusCode, 200)
     t.notOk(res.headers['content-encoding'])
     t.equal(body.toString(), stExpect)
     t.end()
   })
 })
-

package/test/parent-path.js

@@ -1,4 +1,4 @@
-var path = require('path')
+const path = require('path')
 
 global.options = {
   path: path.dirname(__filename) + '/..'