harperdb 3.1.2 → 3.1.5

package/node_modules/fastify-static/index.js

@@ -7,23 +7,22 @@ const { PassThrough } = require('readable-stream')
 const glob = require('glob')
 const send = require('send')
 const fp = require('fastify-plugin')
-const util = require('util')
-const globPromise = util.promisify(glob)
 
 const dirList = require('./lib/dirList')
 
-async function fastifyStatic (fastify, opts) {
-  checkRootPathForErrors(fastify, opts.root)
+function fastifyStatic (fastify, opts, next) {
+  const error = checkRootPathForErrors(fastify, opts.root)
+  if (error !== undefined) return next(error)
 
   const setHeaders = opts.setHeaders
 
   if (setHeaders !== undefined && typeof setHeaders !== 'function') {
-    throw new TypeError('The `setHeaders` option must be a function')
+    return next(new TypeError('The `setHeaders` option must be a function'))
   }
 
   const invalidDirListOpts = dirList.validateOptions(opts.list)
   if (invalidDirListOpts) {
-    throw invalidDirListOpts
+    return next(invalidDirListOpts)
   }
 
   const sendOptions = {
@@ -39,19 +38,15 @@ async function fastifyStatic (fastify, opts) {
     maxAge: opts.maxAge
   }
 
-  function pumpSendToReply (request, reply, pathname, rootPath, rootPathOffset = 0) {
-    const options = Object.assign({}, sendOptions)
+  function pumpSendToReply (request, reply, pathname, rootPath) {
+    var options = Object.assign({}, sendOptions)
 
     if (rootPath) {
-      if (Array.isArray(rootPath)) {
-        options.root = rootPath[rootPathOffset]
-      } else {
-        options.root = rootPath
-      }
+      options.root = rootPath
     }
 
     const stream = send(request.raw, pathname, options)
-    let resolvedFilename
+    var resolvedFilename
     stream.on('file', function (file) {
       resolvedFilename = file
     })
@@ -113,12 +108,6 @@ async function fastifyStatic (fastify, opts) {
           if (opts.list && dirList.handle(pathname, opts.list)) {
             return dirList.send({ reply, dir: dirList.path(opts.root, pathname), options: opts.list, route: pathname })
           }
-
-          // root paths left to try?
-          if (Array.isArray(rootPath) && rootPathOffset < (rootPath.length - 1)) {
-            return pumpSendToReply(request, reply, pathname, rootPath, rootPathOffset + 1)
-          }
-
           return reply.callNotFound()
         }
         reply.send(err)
@@ -163,7 +152,7 @@ async function fastifyStatic (fastify, opts) {
   if (opts.serve !== false) {
     if (opts.wildcard === undefined || opts.wildcard === true) {
       fastify.get(prefix + '*', routeOpts, function (req, reply) {
-        pumpSendToReply(req, reply, '/' + req.params['*'], sendOptions.root)
+        pumpSendToReply(req, reply, '/' + req.params['*'])
       })
       if (opts.redirect === true && prefix !== opts.prefix) {
         fastify.get(opts.prefix, routeOpts, function (req, reply) {
@@ -174,82 +163,60 @@ async function fastifyStatic (fastify, opts) {
       }
     } else {
       const globPattern = typeof opts.wildcard === 'string' ? opts.wildcard : '**/*'
-
-      async function addGlobRoutes (rootPath) {
-        const files = await globPromise(path.join(rootPath, globPattern), { nodir: true })
+      glob(path.join(sendOptions.root, globPattern), { nodir: true }, function (err, files) {
+        if (err) {
+          return next(err)
+        }
         const indexDirs = new Set()
         const indexes = typeof opts.index === 'undefined' ? ['index.html'] : [].concat(opts.index || [])
-
         for (let file of files) {
-          file = file.replace(rootPath.replace(/\\/g, '/'), '').replace(/^\//, '')
-          const route = encodeURI(prefix + file).replace(/\/\//g, '/')
+          file = file.replace(sendOptions.root.replace(/\\/g, '/'), '').replace(/^\//, '')
+          const route = (prefix + file).replace(/\/\//g, '/')
           fastify.get(route, routeOpts, function (req, reply) {
-            pumpSendToReply(req, reply, '/' + file, rootPath)
+            pumpSendToReply(req, reply, '/' + file)
           })
 
           if (indexes.includes(path.posix.basename(route))) {
             indexDirs.add(path.posix.dirname(route))
           }
         }
-
         indexDirs.forEach(function (dirname) {
           const pathname = dirname + (dirname.endsWith('/') ? '' : '/')
           const file = '/' + pathname.replace(prefix, '')
 
           fastify.get(pathname, routeOpts, function (req, reply) {
-            pumpSendToReply(req, reply, file, rootPath)
+            pumpSendToReply(req, reply, file)
           })
 
           if (opts.redirect === true) {
             fastify.get(pathname.replace(/\/$/, ''), routeOpts, function (req, reply) {
-              pumpSendToReply(req, reply, file.replace(/\/$/, ''), rootPath)
+              pumpSendToReply(req, reply, file.replace(/\/$/, ''))
             })
           }
         })
-      }
+        next()
+      })
 
-      if (Array.isArray(sendOptions.root)) {
-        await Promise.all(sendOptions.root.map(addGlobRoutes))
-      } else {
-        await addGlobRoutes(sendOptions.root)
-      }
+      // return early to avoid calling next afterwards
+      return
     }
   }
+
+  next()
 }
 
 function checkRootPathForErrors (fastify, rootPath) {
   if (rootPath === undefined) {
-    throw new Error('"root" option is required')
-  }
-
-  if (Array.isArray(rootPath)) {
-    if (!rootPath.length) { throw new Error('"root" option array requires one or more paths') }
-
-    if ([...new Set(rootPath)].length !== rootPath.length) {
-      throw new Error('"root" option array contains one or more duplicate paths')
-    }
-
-    // check each path and fail at first invalid
-    rootPath.map(path => checkPath(fastify, path))
-    return
-  }
-
-  if (typeof rootPath === 'string') {
-    return checkPath(fastify, rootPath)
+    return new Error('"root" option is required')
   }
-
-  throw new Error('"root" option must be a string or array of strings')
-}
-
-function checkPath (fastify, rootPath) {
   if (typeof rootPath !== 'string') {
-    throw new Error('"root" option must be a string')
+    return new Error('"root" option must be a string')
   }
   if (path.isAbsolute(rootPath) === false) {
-    throw new Error('"root" option must be an absolute path')
+    return new Error('"root" option must be an absolute path')
   }
 
-  let pathStat
+  var pathStat
 
   try {
     pathStat = statSync(rootPath)
@@ -259,11 +226,11 @@ function checkPath (fastify, rootPath) {
       return
     }
 
-    throw e
+    return e
   }
 
   if (pathStat.isDirectory() === false) {
-    throw new Error('"root" option must point to a directory')
+    return new Error('"root" option must point to a directory')
   }
 }
 

package/node_modules/fastify-static/node_modules/glob/README.md

@@ -7,7 +7,7 @@ Match files using the patterns the shell uses, like stars and stuff.
 This is a glob implementation in JavaScript.  It uses the `minimatch`
 library to do its matching.
 
-![](logo/glob.png)
+![a fun cartoon logo made of glob characters](logo/glob.png)
 
 ## Usage
 
@@ -276,6 +276,9 @@ the filesystem.
 * `absolute` Set to true to always receive absolute paths for matched
   files.  Unlike `realpath`, this also affects the values returned in
   the `match` event.
+* `fs` File-system object with Node's `fs` API. By default, the built-in
+  `fs` module will be used. Set to a volume provided by a library like
+  `memfs` to avoid using the "real" file-system.
 
 ## Comparisons to other fnmatch/glob implementations
 

package/node_modules/fastify-static/node_modules/glob/common.js

@@ -1,5 +1,3 @@
-exports.alphasort = alphasort
-exports.alphasorti = alphasorti
 exports.setopts = setopts
 exports.ownProp = ownProp
 exports.makeAbs = makeAbs
@@ -12,17 +10,14 @@ function ownProp (obj, field) {
   return Object.prototype.hasOwnProperty.call(obj, field)
 }
 
+var fs = require("fs")
 var path = require("path")
 var minimatch = require("minimatch")
 var isAbsolute = require("path-is-absolute")
 var Minimatch = minimatch.Minimatch
 
-function alphasorti (a, b) {
-  return a.toLowerCase().localeCompare(b.toLowerCase())
-}
-
 function alphasort (a, b) {
-  return a.localeCompare(b)
+  return a.localeCompare(b, 'en')
 }
 
 function setupIgnores (self, options) {
@@ -81,6 +76,7 @@ function setopts (self, pattern, options) {
   self.stat = !!options.stat
   self.noprocess = !!options.noprocess
   self.absolute = !!options.absolute
+  self.fs = options.fs || fs
 
   self.maxLength = options.maxLength || Infinity
   self.cache = options.cache || Object.create(null)
@@ -150,7 +146,7 @@ function finish (self) {
     all = Object.keys(all)
 
   if (!self.nosort)
-    all = all.sort(self.nocase ? alphasorti : alphasort)
+    all = all.sort(alphasort)
 
   // at *some* point we statted all of these
   if (self.mark) {

package/node_modules/fastify-static/node_modules/glob/glob.js

@@ -40,7 +40,6 @@
 
 module.exports = glob
 
-var fs = require('fs')
 var rp = require('fs.realpath')
 var minimatch = require('minimatch')
 var Minimatch = minimatch.Minimatch
@@ -51,8 +50,6 @@ var assert = require('assert')
 var isAbsolute = require('path-is-absolute')
 var globSync = require('./sync.js')
 var common = require('./common.js')
-var alphasort = common.alphasort
-var alphasorti = common.alphasorti
 var setopts = common.setopts
 var ownProp = common.ownProp
 var inflight = require('inflight')
@@ -503,7 +500,7 @@ Glob.prototype._readdirInGlobStar = function (abs, cb) {
   var lstatcb = inflight(lstatkey, lstatcb_)
 
   if (lstatcb)
-    fs.lstat(abs, lstatcb)
+    self.fs.lstat(abs, lstatcb)
 
   function lstatcb_ (er, lstat) {
     if (er && er.code === 'ENOENT')
@@ -544,7 +541,7 @@ Glob.prototype._readdir = function (abs, inGlobStar, cb) {
   }
 
   var self = this
-  fs.readdir(abs, readdirCb(this, abs, cb))
+  self.fs.readdir(abs, readdirCb(this, abs, cb))
 }
 
 function readdirCb (self, abs, cb) {
@@ -748,13 +745,13 @@ Glob.prototype._stat = function (f, cb) {
   var self = this
   var statcb = inflight('stat\0' + abs, lstatcb_)
   if (statcb)
-    fs.lstat(abs, statcb)
+    self.fs.lstat(abs, statcb)
 
   function lstatcb_ (er, lstat) {
     if (lstat && lstat.isSymbolicLink()) {
       // If it's a symlink, then treat it as the target, unless
       // the target does not exist, then treat it as a file.
-      return fs.stat(abs, function (er, stat) {
+      return self.fs.stat(abs, function (er, stat) {
         if (er)
           self._stat2(f, abs, null, lstat, cb)
         else

package/node_modules/fastify-static/node_modules/glob/package.json

@@ -1,31 +1,31 @@
 {
   "_args": [
     [
-      "glob@7.1.6",
+      "glob@7.2.0",
       "/home/ubuntu/buildAgent/work/20f715f46c2b009e"
     ]
   ],
-  "_from": "glob@7.1.6",
-  "_id": "glob@7.1.6",
+  "_from": "glob@7.2.0",
+  "_id": "glob@7.2.0",
   "_inBundle": false,
-  "_integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
+  "_integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
   "_location": "/fastify-static/glob",
   "_phantomChildren": {},
   "_requested": {
     "type": "version",
     "registry": true,
-    "raw": "glob@7.1.6",
+    "raw": "glob@7.2.0",
     "name": "glob",
     "escapedName": "glob",
-    "rawSpec": "7.1.6",
+    "rawSpec": "7.2.0",
     "saveSpec": null,
-    "fetchSpec": "7.1.6"
+    "fetchSpec": "7.2.0"
   },
   "_requiredBy": [
     "/fastify-static"
   ],
-  "_resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
-  "_spec": "7.1.6",
+  "_resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
+  "_spec": "7.2.0",
   "_where": "/home/ubuntu/buildAgent/work/20f715f46c2b009e",
   "author": {
     "name": "Isaac Z. Schlueter",
@@ -45,9 +45,10 @@
   },
   "description": "a little globber",
   "devDependencies": {
+    "memfs": "^3.2.0",
     "mkdirp": "0",
     "rimraf": "^2.2.8",
-    "tap": "^12.0.1",
+    "tap": "^15.0.6",
     "tick": "0.0.6"
   },
   "engines": {
@@ -75,8 +76,13 @@
     "prepublish": "npm run benchclean",
     "prof": "bash prof.sh && cat profile.txt",
     "profclean": "rm -f v8.log profile.txt",
-    "test": "tap test/*.js --cov",
+    "test": "tap",
     "test-regen": "npm run profclean && TEST_REGEN=1 node test/00-setup.js"
   },
-  "version": "7.1.6"
+  "tap": {
+    "before": "test/00-setup.js",
+    "after": "test/zz-cleanup.js",
+    "jobs": 1
+  },
+  "version": "7.2.0"
 }

package/node_modules/fastify-static/node_modules/glob/sync.js

@@ -1,7 +1,6 @@
 module.exports = globSync
 globSync.GlobSync = GlobSync
 
-var fs = require('fs')
 var rp = require('fs.realpath')
 var minimatch = require('minimatch')
 var Minimatch = minimatch.Minimatch
@@ -11,8 +10,6 @@ var path = require('path')
 var assert = require('assert')
 var isAbsolute = require('path-is-absolute')
 var common = require('./common.js')
-var alphasort = common.alphasort
-var alphasorti = common.alphasorti
 var setopts = common.setopts
 var ownProp = common.ownProp
 var childrenIgnored = common.childrenIgnored
@@ -248,7 +245,7 @@ GlobSync.prototype._readdirInGlobStar = function (abs) {
   var lstat
   var stat
   try {
-    lstat = fs.lstatSync(abs)
+    lstat = this.fs.lstatSync(abs)
   } catch (er) {
     if (er.code === 'ENOENT') {
       // lstat failed, doesn't exist
@@ -285,7 +282,7 @@ GlobSync.prototype._readdir = function (abs, inGlobStar) {
   }
 
   try {
-    return this._readdirEntries(abs, fs.readdirSync(abs))
+    return this._readdirEntries(abs, this.fs.readdirSync(abs))
   } catch (er) {
     this._readdirError(abs, er)
     return null
@@ -444,7 +441,7 @@ GlobSync.prototype._stat = function (f) {
   if (!stat) {
     var lstat
     try {
-      lstat = fs.lstatSync(abs)
+      lstat = this.fs.lstatSync(abs)
     } catch (er) {
       if (er && (er.code === 'ENOENT' || er.code === 'ENOTDIR')) {
         this.statCache[abs] = false
@@ -454,7 +451,7 @@ GlobSync.prototype._stat = function (f) {
 
     if (lstat && lstat.isSymbolicLink()) {
       try {
-        stat = fs.statSync(abs)
+        stat = this.fs.statSync(abs)
       } catch (er) {
         stat = lstat
       }

package/node_modules/fastify-static/package.json

@@ -1,14 +1,14 @@
 {
   "_args": [
     [
-      "fastify-static@3.4.0",
+      "fastify-static@3.3.0",
       "/home/ubuntu/buildAgent/work/20f715f46c2b009e"
     ]
   ],
-  "_from": "fastify-static@3.4.0",
-  "_id": "fastify-static@3.4.0",
+  "_from": "fastify-static@3.3.0",
+  "_id": "fastify-static@3.3.0",
   "_inBundle": false,
-  "_integrity": "sha512-5y9xTNiPTj6/jDwzH6CqBIcI3/yZtocUiHoLud2NYPfHSOLlS6eW6DTheiU8b9WWlfmHfqOjwFFBdhiH1+nBhg==",
+  "_integrity": "sha512-NaaeGWz25TmCYTGR8z90rhpfCuQqxDJauMC7fUTaswtxkM5CUmGGpwInm5/A55qfn9MbUQbPOWtWwSvhY73xHg==",
   "_location": "/fastify-static",
   "_phantomChildren": {
     "fs.realpath": "1.0.0",
@@ -23,18 +23,18 @@
   "_requested": {
     "type": "version",
     "registry": true,
-    "raw": "fastify-static@3.4.0",
+    "raw": "fastify-static@3.3.0",
     "name": "fastify-static",
     "escapedName": "fastify-static",
-    "rawSpec": "3.4.0",
+    "rawSpec": "3.3.0",
     "saveSpec": null,
-    "fetchSpec": "3.4.0"
+    "fetchSpec": "3.3.0"
   },
   "_requiredBy": [
     "/"
   ],
-  "_resolved": "https://registry.npmjs.org/fastify-static/-/fastify-static-3.4.0.tgz",
-  "_spec": "3.4.0",
+  "_resolved": "https://registry.npmjs.org/fastify-static/-/fastify-static-3.3.0.tgz",
+  "_spec": "3.3.0",
   "_where": "/home/ubuntu/buildAgent/work/20f715f46c2b009e",
   "author": {
     "name": "Tommaso Allevi - @allevo"
@@ -62,10 +62,10 @@
     "pre-commit": "^1.2.2",
     "proxyquire": "^2.1.0",
     "simple-get": "^4.0.0",
-    "snazzy": "^9.0.0",
-    "standard": "^16.0.2",
+    "snazzy": "^8.0.0",
+    "standard": "^14.0.0",
     "tap": "^14.10.8",
-    "tsd": "^0.14.0",
+    "tsd": "^0.13.1",
     "typescript": "^4.0.2"
   },
   "eslintConfig": {
@@ -91,7 +91,6 @@
     "coveralls": "tap test/*test.js  test/*/*.test.js --cov",
     "example": "node example/server.js",
     "lint": "standard | snazzy",
-    "lint:fix": "standard --fix",
     "test": "npm run lint && npm run unit && npm run typescript",
     "typescript": "tsd",
     "unit": "tap test/*.test.js"
@@ -100,5 +99,5 @@
     "directory": "test/types"
   },
   "types": "index.d.ts",
-  "version": "3.4.0"
+  "version": "3.3.0"
 }

package/node_modules/fastify-static/test/dir-list.test.js

@@ -110,7 +110,7 @@ t.test('dir list, custom options', t => {
   }
 
   const route = '/public/'
-  const content = { dirs: ['deep', 'shallow'], files: ['.example', 'a .md', 'foo.html', 'foobar.html', 'index.css', 'index.html'] }
+  const content = { dirs: ['deep', 'shallow'], files: ['foo.html', 'foobar.html', 'index.css', 'index.html'] }
 
   helper.arrange(t, options, (url) => {
     t.test(route, t => {
@@ -160,8 +160,6 @@ t.test('dir list html format', t => {
   <li><a href="/shallow">shallow</a></li>
 </ul>
 <ul>
-  <li><a href="/.example" target="_blank">.example</a></li>
-  <li><a href="/a .md" target="_blank">a .md</a></li>
   <li><a href="/foo.html" target="_blank">foo.html</a></li>
   <li><a href="/foobar.html" target="_blank">foobar.html</a></li>
   <li><a href="/index.css" target="_blank">index.css</a></li>
@@ -191,8 +189,6 @@ t.test('dir list html format', t => {
   <li><a href="/shallow">shallow</a></li>
 </ul>
 <ul>
-  <li><a href="/.example" target="_blank">.example</a></li>
-  <li><a href="/a .md" target="_blank">a .md</a></li>
   <li><a href="/foo.html" target="_blank">foo.html</a></li>
   <li><a href="/foobar.html" target="_blank">foobar.html</a></li>
   <li><a href="/index.css" target="_blank">index.css</a></li>