Simplify middleware

server/index.js

@@ -72,7 +72,7 @@ const createServer = (config) => {
     maxAge: '365d'
   }))
 
-  app.use(middleware.createRequestHandler(config))
+  app.use(middleware(config))
 
   const server = http.createServer(app)
 
@@ -101,7 +101,7 @@ const defaultServerConfig = {
   port: parseInt(process.env.PORT, 10) || 5000,
   publicDir: 'public',
 
-  // for express-unpkg
+  // for the middleware
   registryURL: process.env.REGISTRY_URL || 'https://registry.npmjs.org',
   redirectTTL: process.env.REDIRECT_TTL || 500,
   autoIndex: !process.env.DISABLE_INDEX

server/middleware/index.js

@@ -1,4 +1,3 @@
-const http = require('http')
 const tmpdir = require('os-tmpdir')
 const { join: joinPaths } = require('path')
 const { stat: statFile, readFile } = require('fs')
@@ -28,11 +27,11 @@ const checkLocalCache = (dir, callback) =>
     callback(stats && stats.isFile())
   })
 
-const ResolveExtensions = [ '', '.js', '.json' ]
-
 const createTempPath = (name) =>
   joinPaths(tmpdir(), `unpkg-${name}`)
 
+const ResolveExtensions = [ '', '.js', '.json' ]
+
 /**
  * Resolves a path like "lib/file" into "lib/file.js" or
  * "lib/file.json" depending on which one is available, similar
@@ -264,15 +263,4 @@ const createRequestHandler = (options = {}) => {
   return handleRequest
 }
 
-/**
+module.exports = createRequestHandler
- * Creates and returns an HTTP server that serves files from NPM packages.
- */
-const createServer = (options) =>
-  http.createServer(
-    createRequestHandler(options)
-  )
-
-module.exports = {
-  createRequestHandler,
-  createServer
-}