dep bump & associated fixes

ended up needing to bump the minimum version of node.js from 6 to 8 and update a few of the tests
also, lots of formatting changes + one eslint-disable because it kept breaking the code

.gitignore

@@ -6,3 +6,4 @@ node_modules/
 .nyc_output/
 .vscode/
 examples/*/package-lock.json
+.tap

examples/blacklist/blacklist.js

@@ -7,7 +7,7 @@ module.exports = function ({ blockedDomains, message }) {
     const { hostname } = URL.parse(data.url);
     return blockedDomains.some(
       (blockedDomain) =>
-        hostname === blockedDomain || hostname.endsWith(`.${blockedDomain}`)
+        hostname === blockedDomain || hostname.endsWith(`.${blockedDomain}`),
     );
   }
 

examples/blacklist/server.js

@@ -19,7 +19,7 @@ const unblocker = Unblocker({
 app.use(unblocker);
 
 app.get("/", (req, res) =>
-  res.redirect("/proxy/https://en.wikipedia.org/wiki/Main_Page")
+  res.redirect("/proxy/https://en.wikipedia.org/wiki/Main_Page"),
 );
 
 app.listen(8080).on("upgrade", unblocker.onUpgrade);

examples/custom-user-agent/package.json

@@ -7,7 +7,7 @@
     "unblocker": "file:..\\.."
   }, 
   "engines": {
-    "node": ">=6"
+    "node": ">=8"
   },
   "scripts": {
     "start": "node server.js"

examples/custom-user-agent/server.js

@@ -15,12 +15,12 @@ app.use(unblocker);
 
 app.get("/", (req, res) =>
   res.end(
-    "Use the format http://thissite.com/proxy/http://site-i-want.com/ to access the proxy."
-  )
+    "Use the format http://thissite.com/proxy/http://site-i-want.com/ to access the proxy.",
+  ),
 );
 
 app.listen(8080).on("upgrade", unblocker.onUpgrade);
 
 console.log(
-  "app listening on port 8080. Test at http://localhost:8080/proxy/https://duckduckgo.com/?q=what%27s+my+user+agent&atb=v130-1ei&ia=answer"
+  "app listening on port 8080. Test at http://localhost:8080/proxy/https://duckduckgo.com/?q=what%27s+my+user+agent&atb=v130-1ei&ia=answer",
 );

examples/express/server.js

@@ -10,7 +10,7 @@ const unblocker = Unblocker({
 app.use(unblocker);
 
 app.get("/", (req, res) =>
-  res.redirect("/proxy/https://en.wikipedia.org/wiki/Main_Page")
+  res.redirect("/proxy/https://en.wikipedia.org/wiki/Main_Page"),
 );
 
 // start the server and allow unblocker to proxy websockets:

examples/replace_snippet/replace_snippet.js

@@ -18,7 +18,7 @@ module.exports = function (config) {
             this.push(updated, "utf8");
             next();
           },
-        })
+        }),
       );
     }
   }

examples/replace_snippet/server.js

@@ -12,15 +12,16 @@ app.use(
     responseMiddleware: [
       replaceSnippet({
         processContentTypes: ["text/html"],
-        searchFor: /<script type="text\/javascript">\s*BrowserCheck.testForCookies\(\);\s*<\/script>/i,
+        searchFor:
+          /<script type="text\/javascript">\s*BrowserCheck.testForCookies\(\);\s*<\/script>/i,
         replaceWith: "",
       }),
     ],
-  })
+  }),
 );
 
 app.get("/", (req, res) =>
-  res.redirect("/proxy/https://en.wikipedia.org/wiki/Main_Page")
+  res.redirect("/proxy/https://en.wikipedia.org/wiki/Main_Page"),
 );
 
 app.listen(8080);

examples/simple/server.js

@@ -18,7 +18,7 @@ var server = http
       if (req.url == "/") {
         res.writeHead(200, headers);
         return res.end(
-          "Use the format http://thissite.com/proxy/http://site-i-want.com/ to access the proxy."
+          "Use the format http://thissite.com/proxy/http://site-i-want.com/ to access the proxy.",
         );
       } else {
         res.writeHead(404, headers);

examples/whitelist/server.js

@@ -18,7 +18,7 @@ const unblocker = Unblocker({
 app.use(unblocker);
 
 app.get("/", (req, res) =>
-  res.redirect("/proxy/https://en.wikipedia.org/wiki/Main_Page")
+  res.redirect("/proxy/https://en.wikipedia.org/wiki/Main_Page"),
 );
 
 app.listen(8080).on("upgrade", unblocker.onUpgrade);

examples/whitelist/whitelist.js

@@ -7,7 +7,7 @@ module.exports = function ({ allowedDomains, message }) {
     const { hostname } = URL.parse(data.url);
     return allowedDomains.some(
       (allowedDomain) =>
-        hostname === allowedDomain || hostname.endsWith(`.${allowedDomain}`)
+        hostname === allowedDomain || hostname.endsWith(`.${allowedDomain}`),
     );
   }
 

examples/youtube/server.js

@@ -21,7 +21,7 @@ var server = http
       if (req.url == "/") {
         res.writeHead(200, headers);
         return res.end(
-          'Visit a link such as <a href="/proxy/https://www.youtube.com/watch?v=dQw4w9WgXcQ"><script>document.write(window.location)</script>proxy/https://www.youtube.com/watch?v=dQw4w9WgXcQ</a> to see the magic.'
+          'Visit a link such as <a href="/proxy/https://www.youtube.com/watch?v=dQw4w9WgXcQ"><script>document.write(window.location)</script>proxy/https://www.youtube.com/watch?v=dQw4w9WgXcQ</a> to see the magic.',
         );
       } else {
         res.writeHead(404, headers);

examples/youtube/youtube.js

@@ -33,14 +33,14 @@ ${formats
     (format) =>
       `  <source type="${format.mimeType
         .split(";")
-        .shift()}" src="/proxy/${format.url.replace(/&/g, "&amp;")}">`
+        .shift()}" src="/proxy/${format.url.replace(/&/g, "&amp;")}">`,
   )
   .join("\n")}
 </video>
 <p>${info.videoDetails.description.replace(/[\n]/g, "\n<br>")}</p>
 </body>
 </html>
-`
+`,
         );
       })
       .catch((err) => {

lib/charsets.js

@@ -36,7 +36,7 @@ function charsets(config) {
         data.stream = data.stream.pipe(
           new PassThrough({
             encoding: "utf8",
-          })
+          }),
         );
       }
 
@@ -53,7 +53,8 @@ module.exports = charsets;
 
 // based on https://github.com/ashtuchkin/iconv-lite/blob/master/lib/streams.js
 
-var re_charset_finder = /<\?xml[^>]+encoding="([^">]+)"|<meta [^>]*charset=['"]?([^ '">]+)['"]/i; // warning: making this global causes it to not include the matched value in the results :/
+var re_charset_finder =
+  /<\?xml[^>]+encoding="([^">]+)"|<meta [^>]*charset=['"]?([^ '">]+)['"]/i; // warning: making this global causes it to not include the matched value in the results :/
 
 // == Decoder stream =======================================================
 function IconvHtmlStream(options) {
@@ -77,7 +78,7 @@ IconvHtmlStream.prototype = Object.create(Transform.prototype, {
 IconvHtmlStream.prototype._transform = function (chunk, encoding, done) {
   if (!Buffer.isBuffer(chunk))
     return done(
-      new Error("delayed decoding stream needs buffers as its input.")
+      new Error("delayed decoding stream needs buffers as its input."),
     );
 
   if (this.isBuffering) {
@@ -123,7 +124,7 @@ IconvHtmlStream.prototype.startStreaming = function (charset, encoding, done) {
   } else {
     console.error(
       "unrecognized charset %s, decoding as utf8",
-      this.inputEncoding
+      this.inputEncoding,
     );
   }
   this.emit("charset", this.inputEncoding);
@@ -150,7 +151,8 @@ IconvHtmlStream.prototype._flush = function (done) {
   }
 };
 
-var re_charset_replacer = /<\?xml[^>]+encoding="([^">]+)"|<meta [^>]*charset=['"]?([^ '">]+)['"]/gi; // similar to the charset_finder, except global
+var re_charset_replacer =
+  /<\?xml[^>]+encoding="([^">]+)"|<meta [^>]*charset=['"]?([^ '">]+)['"]/gi; // similar to the charset_finder, except global
 
 function MetaCharsetReplacerStream(options) {
   options = options || {};
@@ -168,7 +170,7 @@ MetaCharsetReplacerStream.prototype = Object.create(Transform.prototype, {
 MetaCharsetReplacerStream.prototype._transform = function (
   chunk,
   encoding,
-  done
+  done,
 ) {
   done(
     null,
@@ -182,10 +184,10 @@ MetaCharsetReplacerStream.prototype._transform = function (
           debug(
             "rewriting charset meta tag from %s to %s",
             subChunk,
-            newSubChunk
+            newSubChunk,
           );
           return newSubChunk;
-        }
-      )
+        },
+      ),
   );
 };

lib/client-scripts.js

@@ -11,7 +11,7 @@ module.exports = function ({ prefix }) {
   const clientScriptPathFs = path.join(
     __dirname,
     clientDir,
-    "unblocker-client.js"
+    "unblocker-client.js",
   );
   const isProduction = process.env.NODE_ENV === "production";
   const sendOpts = {
@@ -44,12 +44,12 @@ module.exports = function ({ prefix }) {
                 prefix,
                 url: data.url,
               })}, window);</script>
-`
+`,
             );
             this.push(updated, "utf8");
             next();
           },
-        })
+        }),
       );
     }
   }

lib/client/unblocker-client.js

@@ -191,7 +191,7 @@
             wsSecure +
             "://" +
             wsHost +
-            wsPath
+            wsPath // eslint-disable-line
         );
       }
       // fallback in case the regex failed

lib/content-length.js

@@ -7,7 +7,7 @@ module.exports = function (/*config*/) {
     // if any of the middleware is possibly changing the body, remove the content-length header
     if (data.stream != data.remoteResponse) {
       debug(
-        "deleting content-length header due to possible content changes by other middleware"
+        "deleting content-length header due to possible content changes by other middleware",
       );
       delete data.headers["content-length"];
     }

lib/cookies.js

@@ -32,7 +32,7 @@ function cookies(config) {
       debug(
         "copying cookies from %s to %s",
         data.url,
-        uri.query[REDIRECT_QUERY_PARAM]
+        uri.query[REDIRECT_QUERY_PARAM],
       );
       var cookies = libCookie.parse(data.headers.cookie || "");
       var setCookieHeaders = Object.keys(cookies).map(function (name) {
@@ -97,7 +97,7 @@ function cookies(config) {
 
         // get all of the old cookies (from the request) indexed by name, and create set-cookie headers for each one
         var oldCookies = libCookie.parse(
-          data.clientRequest.headers.cookie || ""
+          data.clientRequest.headers.cookie || "",
         );
         var oldSetCookieHeaders = _.mapValues(
           oldCookies,
@@ -106,7 +106,7 @@ function cookies(config) {
               path:
                 config.prefix + nextUri.protocol + "//" + nextUri.host + "/",
             });
-          }
+          },
         );
 
         // but, if we have a new cookie with the same name as an old one, delete the old one
@@ -116,7 +116,7 @@ function cookies(config) {
 
         // finally, append the remaining old cookie headers to any existing set-cookie headers in the response
         data.headers["set-cookie"] = (data.headers["set-cookie"] || []).concat(
-          _.values(oldSetCookieHeaders)
+          _.values(oldSetCookieHeaders),
         );
       }
     }
@@ -139,7 +139,7 @@ function cookies(config) {
         debug(
           "rewriting link from %s to %s in order to allow cookies to be copied over to new path",
           proxiedUrl,
-          cookieProxiedUrl
+          cookieProxiedUrl,
         );
         return cookieProxiedUrl;
       } else {
@@ -153,7 +153,7 @@ function cookies(config) {
       var tld = TLD.registered(uri.hostname);
       var RE_PROTO_SUBDOMAIN_URL = new RegExp(
         config.prefix + "(https?://([a-z0-9.-]+.)?" + tld + "[^'\") \\\\]*)",
-        "ig"
+        "ig",
       );
 
       data.stream = data.stream.pipe(
@@ -166,7 +166,7 @@ function cookies(config) {
             this.push(updated, "utf8");
             next();
           },
-        })
+        }),
       );
     }
   }

lib/decompress.js

@@ -42,7 +42,7 @@ module.exports = function (config) {
     if (contentTypes.shouldProcess(config, data) && shouldProcess(data)) {
       debug(
         "decompressing %s encoding and deleting content-encoding header",
-        data.headers["content-encoding"]
+        data.headers["content-encoding"],
       );
 
       // https://github.com/nfriedly/node-unblocker/pull/105

lib/get-real-url.js

@@ -10,7 +10,7 @@ module.exports = function (config) {
   // note: the prefix only appears in the regex once because the other will have already been trimmed out.
   var RE_DUOBLE_PREFIX = new RegExp(
     "^https?:/?/?" + config.prefix + "(https?://)",
-    "i"
+    "i",
   );
   /**
    * Takes a /proxy/http://site.com url from a request or a referer and returns the http://site.com/ part

lib/meta-robots.js

@@ -12,7 +12,7 @@ module.exports = function (/* config */) {
           .toString()
           .replace(
             "</head>",
-            '<meta name="ROBOTS" content="NOINDEX, NOFOLLOW"/>\n</head>'
+            '<meta name="ROBOTS" content="NOINDEX, NOFOLLOW"/>\n</head>',
           );
         this.push(updated, "utf8");
         next();

lib/middleware-debugger.js

@@ -23,7 +23,7 @@ function getDebugMiddlewareFor(middleware, dir) {
         "starting %s middleware stack for %s %s",
         dir,
         data.contentType || "",
-        data.url
+        data.url,
       );
       data.prevStream = null;
     }
@@ -43,7 +43,7 @@ function getDebugMiddlewareFor(middleware, dir) {
               dir,
               prevMiddleware || "source",
               chunk.length,
-              hash
+              hash,
             );
             if (data.prevHash && hash != data.prevHash) {
               debug("chunk modified by " + prevMiddleware);
@@ -52,7 +52,7 @@ function getDebugMiddlewareFor(middleware, dir) {
             this.push(chunk);
             next();
           },
-        })
+        }),
       );
     }
     if (nextName) {