[adhoc] Address lint issues.

nik-blue-lava · monkpow · commit c379f12e394f · 2023-09-04T14:55:39.000-05:00
diff --git a/.eslintrc b/.eslintrc
@@ -39,11 +39,11 @@
       120
     ],
     "max-depth": [
-      2,
-      2
+      1,
+      3
     ],
     "complexity": [
-      2,
+      1,
       15
     ],
     "new-cap": 2,
diff --git a/app/steps/buildProxyReq.js b/app/steps/buildProxyReq.js
@@ -14,7 +14,7 @@ function buildProxyReq(Container) {
 
   return Promise
     .all([parseBody, createReqOptions])
-    .then(function(responseArray) {
+    .then(function (responseArray) {
       Container.proxy.bodyContent = responseArray[0];
       Container.proxy.reqBuilder = responseArray[1];
       debug('proxy request options:', Container.proxy.reqBuilder);
diff --git a/app/steps/copyProxyResHeadersToUserRes.js b/app/steps/copyProxyResHeadersToUserRes.js
@@ -1,16 +1,16 @@
 'use strict';
 
 function copyProxyResHeadersToUserRes(container) {
-  return new Promise(function(resolve) {
+  return new Promise(function (resolve) {
     var res = container.user.res;
     var rsp = container.proxy.res;
 
     if (!res.headersSent) {
-        res.status(rsp.statusCode);
-        Object.keys(rsp.headers)
-        .filter(function(item) { return item !== 'transfer-encoding'; })
-        .forEach(function(item) {
-            res.set(item, rsp.headers[item]);
+      res.status(rsp.statusCode);
+      Object.keys(rsp.headers)
+        .filter(function (item) { return item !== 'transfer-encoding'; })
+        .forEach(function (item) {
+          res.set(item, rsp.headers[item]);
         });
     }
 
diff --git a/app/steps/decorateProxyReqBody.js b/app/steps/decorateProxyReqBody.js
@@ -16,7 +16,7 @@ function decorateProxyReqBody(container) {
 
   return Promise
     .resolve(resolverFn(container.proxy.bodyContent, container.user.req))
-    .then(function(bodyContent) {
+    .then(function (bodyContent) {
       container.proxy.bodyContent = bodyContent;
       return Promise.resolve(container);
     });
diff --git a/app/steps/decorateUserRes.js b/app/steps/decorateUserRes.js
@@ -9,11 +9,11 @@ function isResGzipped(res) {
 }
 
 function zipOrUnzip(method) {
-  return function(rspData, res) {
+  return function (rspData, res) {
     return new Promise(function (resolve, reject) {
       if (isResGzipped(res) && rspData.length) {
-        zlib[method](rspData, function(err, buffer) {
-          if(err) {
+        zlib[method](rspData, function (err, buffer) {
+          if (err) {
             reject(err);
           } else {
             resolve(buffer);
@@ -37,11 +37,11 @@ function verifyBuffer(rspd, reject) {
 
 function updateHeaders(res, rspdBefore, rspdAfter, reject) {
   if (!res.headersSent) {
-      res.set('content-length', rspdAfter.length);
+    res.set('content-length', rspdAfter.length);
   } else if (rspdAfter.length !== rspdBefore.length) {
-      var error = '"Content-Length" is already sent,' +
+    var error = '"Content-Length" is already sent,' +
           'the length of response data can not be changed';
-      return reject(new Error(error));
+    return reject(new Error(error));
   }
 }
 
@@ -56,27 +56,27 @@ function decorateProxyResBody(container) {
   var proxyRes = container.proxy.res;
   var req = container.user.req;
   var res = container.user.res;
-  var originalResData; 
+  var originalResData;
 
   if (res.statusCode === 304) {
     debug('Skipping userResDecorator on response 304');
     return Promise.resolve(container);
   }
 
   return proxyResDataPromise
-    .then(function(proxyResData){
+    .then(function (proxyResData) {
       originalResData = proxyResData;
       return resolverFn(proxyRes, proxyResData, req, res);
     })
-    .then(function(modifiedResData) {
-      return new Promise(function(resolve, reject) {
+    .then(function (modifiedResData) {
+      return new Promise(function (resolve, reject) {
         var rspd = as.buffer(modifiedResData, container.options);
         verifyBuffer(rspd, reject);
         updateHeaders(res, originalResData, rspd, reject);
-        maybeZipPromise(rspd, container.proxy.res).then(function(buffer) {
+        maybeZipPromise(rspd, container.proxy.res).then(function (buffer) {
           container.proxy.resData = buffer;
           resolve(container);
-        }).catch(function(error){
+        }).catch(function (error) {
           reject(error);
         });
       });
diff --git a/app/steps/decorateUserResHeaders.js b/app/steps/decorateUserResHeaders.js
@@ -11,14 +11,14 @@ function decorateUserResHeaders(container) {
 
   const clearAllHeaders = (res) => {
     for (const header in getHeaders(res)) {
-      res.removeHeader(header)
+      res.removeHeader(header);
     }
-  }
+  };
 
   return Promise
     .resolve(resolverFn(headers, container.user.req, container.user.res, container.proxy.req, container.proxy.res))
-    .then(function(headers) {
-      return new Promise(function(resolve) {
+    .then(function (headers) {
+      return new Promise(function (resolve) {
         clearAllHeaders(container.user.res);
         container.user.res.set(headers);
         resolve(container);
diff --git a/app/steps/handleProxyErrors.js b/app/steps/handleProxyErrors.js
@@ -6,7 +6,7 @@ function connectionResetHandler(err, res) {
   if (err && err.code === 'ECONNRESET') {
     debug('Error: Connection reset due to timeout.');
     res.setHeader('X-Timeout-Reason', 'express-http-proxy reset the request.');
-    res.writeHead(504, {'Content-Type': 'text/plain'});
+    res.writeHead(504, { 'Content-Type': 'text/plain' });
     res.end();
   }
 }
diff --git a/app/steps/maybeSkipToNextHandler.js b/app/steps/maybeSkipToNextHandler.js
@@ -16,7 +16,7 @@ function maybeSkipToNextHandler(container) {
       } else {
         return Promise.resolve(container);
       }
-    })
+    });
 }
 
 module.exports = maybeSkipToNextHandler;
diff --git a/app/steps/prepareProxyReq.js b/app/steps/prepareProxyReq.js
@@ -15,7 +15,7 @@ function getContentLength(body) {
 
 
 function prepareProxyReq(container) {
-  return new Promise(function(resolve) {
+  return new Promise(function (resolve) {
     var bodyContent = container.proxy.bodyContent;
     var reqOpt = container.proxy.reqBuilder;
 
diff --git a/app/steps/resolveProxyReqPath.js b/app/steps/resolveProxyReqPath.js
@@ -12,7 +12,7 @@ function resolveProxyReqPath(container) {
 
   return Promise
     .resolve(resolverFn(container.user.req))
-    .then(function(resolvedPath) {
+    .then(function (resolvedPath) {
       container.proxy.reqBuilder.path = resolvedPath;
       debug('resolved proxy path:', resolvedPath);
       return Promise.resolve(container);
diff --git a/app/steps/sendProxyRequest.js b/app/steps/sendProxyRequest.js
@@ -8,27 +8,27 @@ function sendProxyRequest(Container) {
   var reqOpt = Container.proxy.reqBuilder;
   var options = Container.options;
 
-  return new Promise(function(resolve, reject) {
+  return new Promise(function (resolve, reject) {
     var protocol = Container.proxy.requestModule;
-    var proxyReq = Container.proxy.req = protocol.request(reqOpt, function(rsp) {
+    var proxyReq = Container.proxy.req = protocol.request(reqOpt, function (rsp) {
       if (options.stream) {
         Container.proxy.res = rsp;
         return resolve(Container);
       }
 
       var chunks = [];
-      rsp.on('data', function(chunk) { chunks.push(chunk); });
-      rsp.on('end', function() {
+      rsp.on('data', function (chunk) { chunks.push(chunk); });
+      rsp.on('end', function () {
         Container.proxy.res = rsp;
         Container.proxy.resData = Buffer.concat(chunks, chunkLength(chunks));
         resolve(Container);
       });
       rsp.on('error', reject);
     });
 
-    proxyReq.on('socket', function(socket) {
+    proxyReq.on('socket', function (socket) {
       if (options.timeout) {
-        socket.setTimeout(options.timeout, function() {
+        socket.setTimeout(options.timeout, function () {
           proxyReq.abort();
         });
       }
@@ -37,14 +37,15 @@ function sendProxyRequest(Container) {
     proxyReq.on('error', reject);
 
     // this guy should go elsewhere, down the chain
+
     if (options.parseReqBody) {
     // We are parsing the body ourselves so we need to write the body content
     // and then manually end the request.
 
       //if (bodyContent instanceof Object) {
-        //throw new Error
-        //debugger;
-        //bodyContent = JSON.stringify(bodyContent);
+      //throw new Error
+      //debugger;
+      //bodyContent = JSON.stringify(bodyContent);
       //}
 
       if (bodyContent.length) {
@@ -53,7 +54,7 @@ function sendProxyRequest(Container) {
         if (contentType === 'x-www-form-urlencoded' || contentType === 'application/x-www-form-urlencoded') {
           try {
             var params = JSON.parse(body);
-            body = Object.keys(params).map(function(k) { return k + '=' + params[k]; }).join('&');
+            body = Object.keys(params).map(function (k) { return k + '=' + params[k]; }).join('&');
           } catch (e) {
             // bodyContent is not json-format
           }
@@ -64,11 +65,13 @@ function sendProxyRequest(Container) {
       proxyReq.end();
     } else {
     // Pipe will call end when it has completely read from the request.
+
       req.pipe(proxyReq);
     }
 
-    req.on('aborted', function() {
+    req.on('aborted', function () {
     // reject?
+
       proxyReq.abort();
     });
   });
diff --git a/package.json b/package.json
@@ -10,7 +10,7 @@
     "test": "npm -s run mocha && npm run -s lint",
     "test:debug": "mocha debug -R spec test --recursive --exit",
     "mocha": "mocha -R spec test --recursive --exit",
-    "lint": "eslint index.js **/*js"
+    "lint": "eslint index.js app/**/*js lib/*js"
   },
   "repository": {
     "type": "git",

Original file line number	Diff line number	Diff line change
`@@ -39,11 +39,11 @@`
`39`	`39`	`120`
`40`	`40`	`],`
`41`	`41`	`"max-depth": [`
`42`		`- 2,`
`43`		`- 2`
	`42`	`+ 1,`
	`43`	`+ 3`
`44`	`44`	`],`
`45`	`45`	`"complexity": [`
`46`		`- 2,`
	`46`	`+ 1,`
`47`	`47`	`15`
`48`	`48`	`],`
`49`	`49`	`"new-cap": 2,`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ function connectionResetHandler(err, res) {`
`6`	`6`	`if (err && err.code === 'ECONNRESET') {`
`7`	`7`	`debug('Error: Connection reset due to timeout.');`
`8`	`8`	`res.setHeader('X-Timeout-Reason', 'express-http-proxy reset the request.');`
`9`		`- res.writeHead(504, {'Content-Type': 'text/plain'});`
	`9`	`+ res.writeHead(504, { 'Content-Type': 'text/plain' });`
`10`	`10`	`res.end();`
`11`	`11`	`}`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ function maybeSkipToNextHandler(container) {`
`16`	`16`	`} else {`
`17`	`17`	`return Promise.resolve(container);`
`18`	`18`	`}`
`19`		`- })`
	`19`	`+ });`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`module.exports = maybeSkipToNextHandler;`