Simplify code

Co-authored-by: Matti Schneider <gh@mattischneider.fr>

Author: Ndpnt

src/archivist/fetcher/fullDomFetcher.js

@@ -107,11 +107,12 @@ export async function launchHeadlessBrowser() {
 
     proxyCredentials = extractProxyCredentials(httpProxy, httpsProxy);
 
-    options.args = [].concat(options.args, `--proxy-server=http=${httpProxyUrl.host};https=${httpsProxyUrl.host}`);
+    options.args.push(`--proxy-server=http=${httpProxyUrl.host};https=${httpsProxyUrl.host}`);
   }
 
   if (process.env.FETCHER_NO_SANDBOX) {
-    options.args = [].concat(options.args, [ '--no-sandbox', '--disable-setuid-sandbox' ]);
+    options.args.push('--no-sandbox');
+    options.args.push('--disable-setuid-sandbox');
   }
 
   browser = await puppeteer.launch(options);

src/archivist/fetcher/proxyUtils.js

@@ -1,22 +1,11 @@
 export function resolveProxyConfiguration() {
-  let httpProxy = null;
-  let httpsProxy = null;
+  const httpProxy = process.env.http_proxy || process.env.HTTP_PROXY;
+  const httpsProxy = process.env.https_proxy || process.env.HTTPS_PROXY || httpProxy;
 
-  if (process.env.http_proxy) {
-    httpProxy = process.env.http_proxy;
-  } else if (process.env.HTTP_PROXY) {
-    httpProxy = process.env.HTTP_PROXY;
-  }
-
-  if (process.env.https_proxy) {
-    httpsProxy = process.env.https_proxy;
-  } else if (process.env.HTTPS_PROXY) {
-    httpsProxy = process.env.HTTPS_PROXY;
-  } else if (httpProxy) {
-    httpsProxy = httpProxy;
-  }
-
-  return { httpProxy, httpsProxy };
+  return {
+    httpProxy,
+    httpsProxy
+  };
 }
 
 export function extractProxyCredentials(httpProxy, httpsProxy) {