fix: remove HttpError sub-classes

Author: pvdlg

lib/plugins/endpoint-methods/validate.js

@@ -3,7 +3,7 @@
 module.exports = validate
 
 const set = require('lodash/set')
-const errors = require('../../request/errors')
+const HttpError = require('../../request/http-error')
 
 function validate (endpointParams, options) {
   Object.keys(endpointParams).forEach(parameterName => {
@@ -24,34 +24,34 @@ function validate (endpointParams, options) {
 
     if ((parameter.required && !paramIsPresent) ||
         (parameter['allow-null'] === false && paramIsNull)) {
-      throw new errors.BadRequest(`Empty value for parameter '${parameterName}': ${value}`)
+      throw new HttpError(`Empty value for parameter '${parameterName}': ${value}`, 400)
     }
 
     if (parameter.enum) {
       if (parameter.enum.indexOf(value) === -1) {
-        throw new errors.BadRequest(`Invalid value for parameter '${parameterName}': ${value}`)
+        throw new HttpError(`Invalid value for parameter '${parameterName}': ${value}`, 400)
       }
     }
 
     if (parameter.validation) {
       const regex = new RegExp(parameter.validation)
       if (!regex.test(value)) {
-        throw new errors.BadRequest(`Invalid value for parameter '${parameterName}': ${value}`)
+        throw new HttpError(`Invalid value for parameter '${parameterName}': ${value}`, 400)
       }
     }
 
     if (expectedType === 'number') {
       value = parseInt(value, 10)
       if (isNaN(value)) {
-        throw new errors.BadRequest(`Invalid value for parameter '${parameterName}': ${options[parameterName]} is NaN`)
+        throw new HttpError(`Invalid value for parameter '${parameterName}': ${options[parameterName]} is NaN`, 400)
       }
     }
 
     if (expectedType === 'json' && typeof value === 'string') {
       try {
         value = JSON.parse(value)
       } catch (exception) {
-        throw new errors.BadRequest(`JSON parse error of value for parameter '${parameterName}': ${value}`)
+        throw new HttpError(`JSON parse error of value for parameter '${parameterName}': ${value}`, 400)
       }
     }
 

lib/plugins/pagination/get-page.js

@@ -1,6 +1,6 @@
 module.exports = getPage
 
-const errors = require('../../request/errors')
+const HttpError = require('../../request/http-error')
 const getPageLinks = require('./get-page-links')
 
 function getPage (octokit, link, which, headers, callback) {
@@ -12,7 +12,7 @@ function getPage (octokit, link, which, headers, callback) {
   const url = getPageLinks(link)[which]
 
   if (!url) {
-    const urlError = new errors.NotFound(`No ${which} page found`)
+    const urlError = new HttpError(`No ${which} page found`, 404)
     if (callback) {
       return callback(urlError)
     }

lib/request/errors.js lib/request/http-error.js

@@ -8,11 +8,11 @@ const STATUS_CODES = {
   504: 'Gateway Timeout'
 }
 
-module.exports.HttpError = class extends Error {
+module.exports = class HttpError extends Error {
   constructor (message, code, headers) {
     super(message)
     Error.captureStackTrace(this, this.constructor)
-    this.name = STATUS_CODES[code] ? STATUS_CODES[code].replace(/\s/g, '') : 'HttpError'
+    this.name = 'HttpError'
     this.code = code
     this.status = STATUS_CODES[code]
     this.headers = headers
@@ -30,13 +30,3 @@ module.exports.HttpError = class extends Error {
     }
   }
 }
-
-Object.keys(STATUS_CODES).forEach(status => {
-  const className = STATUS_CODES[status].replace(/\s/g, '')
-  module.exports[className] = class extends module.exports.HttpError {
-    constructor (message) {
-      super(message, parseInt(status, 10))
-      this.name = className
-    }
-  }
-})

lib/request/request.js

@@ -11,7 +11,7 @@ const debug = require('debug')('octokit:rest')
 const isArrayBuffer = require('is-array-buffer')
 const isStream = require('is-stream')
 
-const errors = require('./errors')
+const HttpError = require('./http-error')
 
 function httpRequest (requestOptions) {
   requestOptions = Object.assign(
@@ -60,7 +60,7 @@ function httpRequest (requestOptions) {
 
       /* istanbul ignore next */
       response.on('error', (error) => {
-        reject(new errors.InternalServerError(error.message))
+        reject(new HttpError(error.message, 500))
       })
       response.on('end', () => {
         if (response.statusCode !== 304 && response.statusCode >= 301 && response.statusCode <= 307) {
@@ -70,7 +70,7 @@ function httpRequest (requestOptions) {
         }
 
         if (response.statusCode === 304 || response.statusCode >= 400 || response.statusCode < 10) {
-          reject(new errors.HttpError(data, response.statusCode, response.headers))
+          reject(new HttpError(data, response.statusCode, response.headers))
           return
         }
 
@@ -90,7 +90,7 @@ function httpRequest (requestOptions) {
     request.on('error', (error) => {
       if (aborted) return
       debug('REQUEST ERROR: ' + error.message)
-      reject(new errors.InternalServerError(error.message))
+      reject(new HttpError(error.message, 500))
     })
 
     if (requestOptions.timeout) {
@@ -100,7 +100,7 @@ function httpRequest (requestOptions) {
       debug('REQUEST ERROR: timed out')
       request.abort()
       aborted = true
-      reject(new errors.GatewayTimeout('Request timeout'))
+      reject(new HttpError('Request timeout', 504))
     })
 
     if (requestOptions.body) {

test/integration/request-errors-test.js

@@ -23,7 +23,7 @@ describe('request errors', () => {
     return github.orgs.get({org: 'myorg'})
 
     .catch(error => {
-      error.name.should.equal('GatewayTimeout')
+      error.name.should.equal('HttpError')
       error.code.should.equal(504)
       error.should.have.property('stack')
     })
@@ -42,7 +42,7 @@ describe('request errors', () => {
     return github.orgs.get({org: 'myorg'})
 
     .catch(error => {
-      error.name.should.equal('InternalServerError')
+      error.name.should.equal('HttpError')
       error.code.should.equal(500)
       error.should.have.property('stack')
     })
@@ -61,7 +61,7 @@ describe('request errors', () => {
     return github.orgs.get({org: 'myorg'})
 
     .catch(error => {
-      error.name.should.equal('NotFound')
+      error.name.should.equal('HttpError')
       error.code.should.equal(404)
       error.should.have.property('stack')
     })