npm run fmt

maybe prettier output changed?

Author: minrk

bin/configurable-http-proxy

@@ -67,9 +67,7 @@ args
     "--redirect-port <redirect-port>",
     "Redirect HTTP requests on this port to the server on HTTPS"
   )
-  .option(
-    "--redirect-to <port>",
-    "Redirect HTTP requests from --redirect-port to this port")
+  .option("--redirect-to <port>", "Redirect HTTP requests from --redirect-port to this port")
   .option("--pid-file <pid-file>", "Write our PID to a file")
   // passthrough http-proxy options
   .option("--no-x-forward", "Don't add 'X-forward-' headers to proxied requests")
@@ -84,7 +82,8 @@ args
   .option(
     "--custom-header <header>",
     "Custom header to add to proxied requests. Use same option for multiple headers (--custom-header k1:v1 --custom-header k2:v2)",
-    collectHeadersIntoObject, {}
+    collectHeadersIntoObject,
+    {}
   )
   .option("--insecure", "Disable SSL cert verification")
   .option("--host-routing", "Use host routing (host as first level of path)")
@@ -110,12 +109,12 @@ args
 // collects multiple flags to an object
 // --custom-header "k1:v1" --custom-header " k2 : v2 " --> {"k1":"v1","k2":"v2"}
 function collectHeadersIntoObject(value, previous) {
-  var headerParts = value.split(":").map(p => p.trim())
+  var headerParts = value.split(":").map((p) => p.trim());
   if (headerParts.length != 2) {
     log.error("A single colon was expected in custom header: " + value);
     process.exit(1);
   }
-  previous[headerParts[0]] = headerParts[1]
+  previous[headerParts[0]] = headerParts[1];
 }
 
 args.parse(process.argv);
@@ -206,7 +205,7 @@ if (args.apiSslKey || args.apiSslCert) {
     var chain = fs.readFileSync(args.apiSslCa, "utf8");
     var ca = [];
     var cert = [];
-    chain.split("\n").forEach(function(line) {
+    chain.split("\n").forEach(function (line) {
       cert.push(line);
       if (line.match(/-END CERTIFICATE-/)) {
         ca.push(new Buffer(cert.join("\n")));
@@ -241,7 +240,7 @@ if (args.clientSslKey || args.clientSslCert) {
     var chain = fs.readFileSync(args.clientSslCa, "utf8");
     var ca = [];
     var cert = [];
-    chain.split("\n").forEach(function(line) {
+    chain.split("\n").forEach(function (line) {
       cert.push(line);
       if (line.match(/-END CERTIFICATE-/)) {
         ca.push(new Buffer(cert.join("\n")));
@@ -357,7 +356,7 @@ if (args.pidFile) {
   var fd = fs.openSync(args.pidFile, "w");
   fs.writeSync(fd, process.pid.toString());
   fs.closeSync(fd);
-  process.on("exit", function() {
+  process.on("exit", function () {
     log.debug("Removing %s", args.pidFile);
     fs.unlinkSync(args.pidFile);
   });
@@ -366,9 +365,9 @@ if (args.pidFile) {
 // Redirect HTTP to HTTPS on the proxy's port
 if (options.redirectPort && listen.port !== 80) {
   var http = require("http");
-  var redirectPort = (options.redirectTo ? options.redirectTo : listen.port);
+  var redirectPort = options.redirectTo ? options.redirectTo : listen.port;
   var server = http
-    .createServer(function(req, res) {
+    .createServer(function (req, res) {
       var host = req.headers.host.split(":")[0];
 
       // Make sure that when we redirect, it's to the port the proxy is running on
@@ -379,30 +378,29 @@ if (options.redirectPort && listen.port !== 80) {
       res.writeHead(301, { Location: "https://" + host + req.url });
       res.end();
     })
-    .listen(options.redirectPort, ()=>{
-      log.info("Added HTTP to HTTPS redirection from "
-                + server.address().port
-                + " to "
-                + redirectPort);
+    .listen(options.redirectPort, () => {
+      log.info(
+        "Added HTTP to HTTPS redirection from " + server.address().port + " to " + redirectPort
+      );
     });
 }
 
 // trigger normal exit on SIGINT
 // without this, PID cleanup won't fire on SIGINT
-process.on("SIGINT", function() {
+process.on("SIGINT", function () {
   log.warn("Interrupted");
   process.exit(2);
 });
 
 // trigger normal exit on SIGTERM
 // fired on `docker stop` and during Kubernetes pod container evictions
-process.on("SIGTERM", function() {
+process.on("SIGTERM", function () {
   log.warn("Terminated");
   process.exit(2);
 });
 
 // log uncaught exceptions, don't exit now that setup is complete
-process.on("uncaughtException", function(e) {
+process.on("uncaughtException", function (e) {
   log.error("Uncaught Exception: " + e.message);
   if (e.stack) {
     log.error(e.stack);

lib/configproxy.js

@@ -23,7 +23,7 @@ var http = require("http"),
 function bound(that, method) {
   // bind a method, to ensure `this=that` when it is called
   // because prototype languages are bad
-  return function() {
+  return function () {
     return method.apply(that, arguments);
   };
 }
@@ -50,13 +50,13 @@ function fail(req, res, code, msg) {
 function jsonHandler(handler) {
   // wrap json handler, so the handler is called with parsed data,
   // rather than implementing streaming parsing in the handler itself
-  return function(req, res) {
+  return function (req, res) {
     var args = argumentsArray(arguments);
     var buf = "";
-    req.on("data", function(chunk) {
+    req.on("data", function (chunk) {
       buf += chunk;
     });
-    req.on("end", function() {
+    req.on("end", function () {
       var data;
       try {
         data = JSON.parse(buf) || {};
@@ -72,7 +72,7 @@ function jsonHandler(handler) {
 
 function authorized(method) {
   // decorator for token-authorized handlers
-  return function(req, res) {
+  return function (req, res) {
     if (!this.authToken) {
       return method.apply(this, arguments);
     }
@@ -105,8 +105,8 @@ function parseHost(req) {
 function camelCaseify(options) {
   // camelCaseify options dict, for backward compatibility
   let camelOptions = {};
-  Object.keys(options).forEach(key => {
-    const camelKey = key.replace(/_(.)/g, function(match, part, offset, string) {
+  Object.keys(options).forEach((key) => {
+    const camelKey = key.replace(/_(.)/g, function (match, part, offset, string) {
       return part.toUpperCase();
     });
     if (camelKey !== key) {
@@ -117,7 +117,7 @@ function camelCaseify(options) {
   return camelOptions;
 }
 
-const loadStorage = options => {
+const loadStorage = (options) => {
   if (options.storageBackend) {
     const BackendStorageClass = require(options.storageBackend);
     return new BackendStorageClass(options);
@@ -158,14 +158,14 @@ class ConfigurableProxy extends EventEmitter {
       // Mock the statsd object, rather than pepper the codebase with
       // null checks. FIXME: Maybe use a JS Proxy object (if available?)
       this.statsd = {
-        increment: function() {},
-        decrement: function() {},
-        timing: function() {},
-        gauge: function() {},
-        set: function() {},
-        createTimer: function() {
+        increment: function () {},
+        decrement: function () {},
+        timing: function () {},
+        gauge: function () {},
+        set: function () {},
+        createTimer: function () {
           return {
-            stop: function() {},
+            stop: function () {},
           };
         },
       };
@@ -193,8 +193,8 @@ class ConfigurableProxy extends EventEmitter {
       ],
     ];
 
-    var logErrors = handler => {
-      return function(req, res) {
+    var logErrors = (handler) => {
+      return function (req, res) {
         function logError(e) {
           that.log.error("Error in handler for " + req.method + " " + req.url + ": %s", e);
         }
@@ -227,7 +227,7 @@ class ConfigurableProxy extends EventEmitter {
     // proxy websockets
     this.proxyServer.on("upgrade", bound(this, this.handleProxyWs));
 
-    this.proxy.on("proxyRes", function(proxyRes, req, res) {
+    this.proxy.on("proxyRes", function (proxyRes, req, res) {
       that.statsd.increment("requests." + proxyRes.statusCode, 1);
     });
   }
@@ -267,7 +267,7 @@ class ConfigurableProxy extends EventEmitter {
     // remove a route from the routing table
     var routes = this._routes;
 
-    return routes.get(path).then(result => {
+    return routes.get(path).then((result) => {
       if (result) {
         this.log.info("Removing route %s", path);
         return routes.remove(path);
@@ -278,7 +278,7 @@ class ConfigurableProxy extends EventEmitter {
   getRoute(req, res, path) {
     // GET a single route
     path = this._routes.cleanPath(path);
-    return this._routes.get(path).then(function(route) {
+    return this._routes.get(path).then(function (route) {
       if (!route) {
         res.writeHead(404);
         res.end();
@@ -319,11 +319,11 @@ class ConfigurableProxy extends EventEmitter {
     }
     res.writeHead(200, { "Content-Type": "application/json" });
 
-    return this._routes.getAll().then(routes => {
+    return this._routes.getAll().then((routes) => {
       var results = {};
 
       if (inactiveSince) {
-        Object.keys(routes).forEach(function(path) {
+        Object.keys(routes).forEach(function (path) {
           if (routes[path].last_activity < inactiveSince) {
             results[path] = routes[path];
           }
@@ -349,7 +349,7 @@ class ConfigurableProxy extends EventEmitter {
     }
 
     var that = this;
-    return this.addRoute(path, data).then(function() {
+    return this.addRoute(path, data).then(function () {
       res.writeHead(201);
       res.end();
       that.statsd.increment("api.route.add", 1);
@@ -359,7 +359,7 @@ class ConfigurableProxy extends EventEmitter {
   deleteRoutes(req, res, path) {
     // DELETE removes an existing route
 
-    return this._routes.get(path).then(result => {
+    return this._routes.get(path).then((result) => {
       var p, code;
       if (result) {
         p = this.removeRoute(path);
@@ -382,7 +382,7 @@ class ConfigurableProxy extends EventEmitter {
     var basePath = this.hostRouting ? "/" + parseHost(req) : "";
     var path = basePath + decodeURIComponent(URL.parse(req.url).pathname);
 
-    return this._routes.getTarget(path).then(function(route) {
+    return this._routes.getTarget(path).then(function (route) {
       timer.stop();
       if (route) {
         return {
@@ -399,7 +399,7 @@ class ConfigurableProxy extends EventEmitter {
 
     return routes
       .get(prefix)
-      .then(function(result) {
+      .then(function (result) {
         if (result) {
           return routes.update(prefix, { last_activity: new Date() });
         }
@@ -448,20 +448,20 @@ class ConfigurableProxy extends EventEmitter {
       urlSpec.pathname = urlSpec.pathname + code.toString();
       var secure = /https/gi.test(urlSpec.protocol) ? true : false;
       var url = URL.format(urlSpec);
-      var errorRequest = (secure ? https : http).request(url, function(upstream) {
-        ["content-type", "content-encoding"].map(function(key) {
+      var errorRequest = (secure ? https : http).request(url, function (upstream) {
+        ["content-type", "content-encoding"].map(function (key) {
           if (!upstream.headers[key]) return;
           if (res.setHeader) res.setHeader(key, upstream.headers[key]);
         });
         if (res.writeHead) res.writeHead(code);
-        upstream.on("data", data => {
+        upstream.on("data", (data) => {
           if (res.write) res.write(data);
         });
         upstream.on("end", () => {
           if (res.end) res.end();
         });
       });
-      errorRequest.on("error", e => {
+      errorRequest.on("error", (e) => {
         // custom error failed, fallback on default
         this.log.error("Failed to get custom error page: %s", e);
         this._handleProxyErrorDefault(code, kind, req, res);
@@ -504,16 +504,15 @@ class ConfigurableProxy extends EventEmitter {
     var args = Array.prototype.slice.call(arguments, 1);
 
     // get the proxy target
-    return this.targetForReq(req).then(match => {
+    return this.targetForReq(req).then((match) => {
       if (!match) {
         that.handleProxyError(404, kind, req, res);
         return;
       }
 
       if (kind === "web") {
         that.emit("proxyRequest", req, res);
-      }
-      else {
+      } else {
         that.emit("proxyRequestWs", req, res, args[2]);
       }
       var prefix = match.prefix;
@@ -534,7 +533,7 @@ class ConfigurableProxy extends EventEmitter {
       args.push({ target: target });
 
       // add error handling
-      args.push(function(e) {
+      args.push(function (e) {
         that.handleProxyError(503, kind, req, res, e);
       });
 
@@ -544,11 +543,11 @@ class ConfigurableProxy extends EventEmitter {
       that.proxy[kind].apply(that.proxy, args);
 
       // update timestamp on any request/reply data as well (this includes websocket data)
-      req.on("data", function() {
+      req.on("data", function () {
         that.updateLastActivity(prefix);
       });
 
-      res.on("data", function() {
+      res.on("data", function () {
         that.updateLastActivity(prefix);
       });
 

lib/log.js

@@ -2,7 +2,7 @@
 var strftime = require("strftime"),
   winston = require("winston");
 
-const simpleFormat = winston.format.printf(info => {
+const simpleFormat = winston.format.printf((info) => {
   // console.log(info);
   return `${info.timestamp} [${info.label}] ${info.level}: ${info.message}`;
 });

lib/store.js

@@ -2,7 +2,7 @@
 
 var trie = require("./trie.js");
 
-var NotImplemented = function(name) {
+var NotImplemented = function (name) {
   return {
     name: "NotImplementedException",
     message: "method '" + name + "' not implemented",
@@ -31,7 +31,7 @@ class BaseStore {
     // default get implementation derived from getAll
     // only needs overriding if a more efficient implementation is available
     path = this.cleanPath(path);
-    return this.getAll().then(routes => routes[path]);
+    return this.getAll().then((routes) => routes[path]);
   }
 
   cleanPath(path) {