remove statuses package, precompute errors (#17)

fastify · Jan 14, 2023 · ae3d3d9 · ae3d3d9
1 parent 75e0ff4
commit ae3d3d9
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 28 deletions.
diff --git a/index.js b/index.js
@@ -25,7 +25,6 @@ const ms = require('ms')
 const onFinished = require('on-finished')
 const parseRange = require('range-parser')
 const path = require('path')
-const statuses = require('statuses')
 const Stream = require('stream')
 const util = require('util')
 const decode = require('fast-decode-uri-component')
@@ -62,6 +61,15 @@ const MAX_MAXAGE = 60 * 60 * 24 * 365 * 1000 // 1 year
 
 const UP_PATH_REGEXP = /(?:^|[\\/])\.\.(?:[\\/]|$)/
 
+const ERROR_RESPONSES = {
+  400: createHtmlDocument('Error', 'Bad Request'),
+  403: createHtmlDocument('Error', 'Forbidden'),
+  404: createHtmlDocument('Error', 'Not Found'),
+  412: createHtmlDocument('Error', 'Precondition Failed'),
+  416: createHtmlDocument('Error', 'Range Not Satisfiable'),
+  500: createHtmlDocument('Error', 'Internal Server Error')
+}
+
 /**
  * Return a `SendStream` for `req` and `path`.
  *
@@ -185,8 +193,6 @@ SendStream.prototype.error = function error (status, err) {
   }
 
   const res = this.res
-  const msg = statuses.message[status]
-  const doc = createHtmlDocument('Error', escapeHtml(msg))
 
   // clear existing headers
   clearHeaders(res)
@@ -196,13 +202,15 @@ SendStream.prototype.error = function error (status, err) {
     setHeaders(res, err.headers)
   }
 
+  const doc = ERROR_RESPONSES[status]
+
   // send basic response
   res.statusCode = status
   res.setHeader('Content-Type', 'text/html; charset=UTF-8')
-  res.setHeader('Content-Length', Buffer.byteLength(doc))
+  res.setHeader('Content-Length', doc[1])
   res.setHeader('Content-Security-Policy', "default-src 'none'")
   res.setHeader('X-Content-Type-Options', 'nosniff')
-  res.end(doc)
+  res.end(doc[0])
 }
 
 /**
@@ -404,11 +412,11 @@ SendStream.prototype.redirect = function redirect (path) {
   // redirect
   res.statusCode = 301
   res.setHeader('Content-Type', 'text/html; charset=UTF-8')
-  res.setHeader('Content-Length', Buffer.byteLength(doc))
+  res.setHeader('Content-Length', doc[1])
   res.setHeader('Content-Security-Policy', "default-src 'none'")
   res.setHeader('X-Content-Type-Options', 'nosniff')
   res.setHeader('Location', loc)
-  res.end(doc)
+  res.end(doc[0])
 }
 
 /**
@@ -875,7 +883,7 @@ function contentRange (type, size, range) {
  */
 
 function createHtmlDocument (title, body) {
-  return '<!DOCTYPE html>\n' +
+  const html = '<!DOCTYPE html>\n' +
     '<html lang="en">\n' +
     '<head>\n' +
     '<meta charset="utf-8">\n' +
@@ -885,6 +893,8 @@ function createHtmlDocument (title, body) {
     '<pre>' + body + '</pre>\n' +
     '</body>\n' +
     '</html>\n'
+
+  return [html, Buffer.byteLength(html)]
 }
 
 /**

diff --git a/package.json b/package.json
@@ -29,8 +29,7 @@
     "mime": "^3.0.0",
     "ms": "2.1.3",
     "on-finished": "2.4.1",
-    "range-parser": "~1.2.1",
-    "statuses": "2.0.1"
+    "range-parser": "~1.2.1"
   },
   "devDependencies": {
     "@fastify/pre-commit": "^2.0.2",

diff --git a/test/statuses.test.js b/test/statuses.test.js