ignore QS ? in URLs, use standard for linting, syntax fixes

Author: rvagg

.jshintrc

@@ -1,9 +1,11 @@
 sudo: false
 language: node_js
 node_js:
-  - '4'
-  - '6'
-  - '8'
+  - 8
+  - 10
+  - 12
+  - lts/*
+  - current
 branches:
   only:
     - master

.travis.yml

@@ -1,109 +1,119 @@
-const EventEmitter = require('events').EventEmitter
-    , inherits     = require('util').inherits
-    , crypto       = require('crypto')
-    , bl           = require('bl')
+const EventEmitter = require('events')
+const crypto = require('crypto')
+const bl = require('bl')
 
 function findHandler (url, arr) {
-  if (!Array.isArray(arr)) 
+  if (!Array.isArray(arr)) {
     return arr
-  var ret = arr[0]
-  for (var i = 0; i < arr.length; i++) {
-    if (url.split('?')[0] === arr[i].path)
+  }
+
+  let ret = arr[0]
+  for (let i = 0; i < arr.length; i++) {
+    if (url === arr[i].path) {
       ret = arr[i]
+    }
   }
+
   return ret
 }
 
 function checkType (options) {
-  if (typeof options != 'object')
+  if (typeof options !== 'object') {
     throw new TypeError('must provide an options object')
+  }
 
-  if (typeof options.path != 'string')
+  if (typeof options.path !== 'string') {
     throw new TypeError('must provide a \'path\' option')
+  }
 
-  if (typeof options.secret != 'string')
+  if (typeof options.secret !== 'string') {
     throw new TypeError('must provide a \'secret\' option')
+  }
 }
 
 function create (initOptions) {
-
-  var options
-  //validate type of options
+  let options
+  // validate type of options
   if (Array.isArray(initOptions)) {
-    initOptions.forEach(function(item){
-      checkType(item)
-    })
+    for (let i = 0; i < initOptions.length; i++) {
+      checkType(initOptions[i])
+    }
   } else {
     checkType(initOptions)
   }
 
-  // make it an EventEmitter, sort of
-  handler.__proto__ = EventEmitter.prototype
+  // make it an EventEmitter
+  Object.setPrototypeOf(handler, EventEmitter.prototype)
   EventEmitter.call(handler)
 
   handler.sign = sign
   handler.verify = verify
 
   return handler
 
-
   function sign (data) {
-    return 'sha1=' + crypto.createHmac('sha1', options.secret).update(data).digest('hex')
+    return `sha1=${crypto.createHmac('sha1', options.secret).update(data).digest('hex')}`
   }
 
   function verify (signature, data) {
     return crypto.timingSafeEqual(Buffer.from(signature), Buffer.from(sign(data)))
   }
 
   function handler (req, res, callback) {
-    var events
+    let events
 
     options = findHandler(req.url, initOptions)
 
-    if (typeof options.events == 'string' && options.events != '*')
-      events = [ options.events ]
-  
-    else if (Array.isArray(options.events) && options.events.indexOf('*') == -1)
+    if (typeof options.events === 'string' && options.events !== '*') {
+      events = [options.events]
+    } else if (Array.isArray(options.events) && options.events.indexOf('*') === -1) {
       events = options.events
-      
-    if (req.url.split('?').shift() !== options.path || req.method !== 'POST')
+    }
+
+    if (req.url !== options.path || req.method !== 'POST') {
       return callback()
+    }
 
     function hasError (msg) {
       res.writeHead(400, { 'content-type': 'application/json' })
       res.end(JSON.stringify({ error: msg }))
 
-      var err = new Error(msg)
+      const err = new Error(msg)
 
       handler.emit('error', err, req)
       callback(err)
     }
 
-    var sig   = req.headers['x-hub-signature']
-      , event = req.headers['x-github-event']
-      , id    = req.headers['x-github-delivery']
+    const sig = req.headers['x-hub-signature']
+    const event = req.headers['x-github-event']
+    const id = req.headers['x-github-delivery']
 
-    if (!sig)
+    if (!sig) {
       return hasError('No X-Hub-Signature found on request')
+    }
 
-    if (!event)
+    if (!event) {
       return hasError('No X-Github-Event found on request')
+    }
 
-    if (!id)
+    if (!id) {
       return hasError('No X-Github-Delivery found on request')
+    }
 
-    if (events && events.indexOf(event) == -1)
+    if (events && events.indexOf(event) === -1) {
       return hasError('X-Github-Event is not acceptable')
+    }
 
-    req.pipe(bl(function (err, data) {
+    req.pipe(bl((err, data) => {
       if (err) {
         return hasError(err.message)
       }
 
-      var obj
+      let obj
 
-      if (!verify(sig, data))
+      if (!verify(sig, data)) {
         return hasError('X-Hub-Signature does not match blob signature')
+      }
 
       try {
         obj = JSON.parse(data.toString())
@@ -114,14 +124,14 @@ function create (initOptions) {
       res.writeHead(200, { 'content-type': 'application/json' })
       res.end('{"ok":true}')
 
-      var emitData = {
-          event   : event
-        , id      : id
-        , payload : obj
-        , protocol: req.protocol
-        , host    : req.headers['host']
-        , url     : req.url
-        , path    : options.path
+      const emitData = {
+        event: event,
+        id: id,
+        payload: obj,
+        protocol: req.protocol,
+        host: req.headers.host,
+        url: req.url,
+        path: options.path
       }
 
       handler.emit(event, emitData)
@@ -130,5 +140,4 @@ function create (initOptions) {
   }
 }
 
-
 module.exports = create

github-webhook-handler.js

@@ -5,7 +5,8 @@
   "main": "github-webhook-handler.js",
   "types": "github-webhook-handler.d.ts",
   "scripts": {
-    "test": "node test.js"
+    "lint": "standard *.js",
+    "test": "npm run lint && node test.js"
   },
   "keywords": [
     "github",
@@ -18,12 +19,13 @@
   },
   "license": "MIT",
   "dependencies": {
-    "bl": "~1.1.2"
+    "bl": "~4.0.0"
   },
   "devDependencies": {
     "@types/node": "*",
-    "run-series": "~1.1.4",
-    "tape": "~4.6.0",
-    "through2": "~2.0.1"
+    "run-series": "~1.1.8",
+    "standard": "~14.3.1",
+    "tape": "~4.11.0",
+    "through2": "~3.0.1"
   }
 }