Proxy support for amp-optimizer

packages/optimizer/README.md

@@ -110,26 +110,11 @@ Automatically import any missing AMP Extensions (e.g. amp-carousel).
 
 #### `fetch`
 
-Provide a custom fetch handler. You can use this option to configure a custom proxy server. Example:
+Inside proxy, environment variable `https_proxy` is supported. Example:
 
-```js
-const nodeFetch = require('node-fetch');
-
-const proxyHost = '...';
-const proxyPort = '...';
-
-const fetch = (url, opts={}) => {
-  opts.agent = new HttpsProxyAgent(`${proxyHost}:${proxyPort}');
-  return nodeFetch(url, opts)
-}
-const optimizer = AmpOptimizer.create({
-  fetch,
-});
 ```
-
-- name: `fetch`
-- valid options: a [whatwg fetch](https://github.com/whatwg/fetch) compatible fetch implementation.
-- default: [node-fetch](https://www.npmjs.com/package/node-fetch)
+https_proxy=http://[proxy_host]:[port]
+```
 
 #### `format`
 

packages/optimizer/lib/warmup.js

@@ -16,6 +16,7 @@
 
 const AbortController = require('abort-controller');
 const fetch = require('node-fetch');
+const HttpsProxyAgent = require('https-proxy-agent');
 const log = require('@ampproject/toolbox-core').log.tag('AMP OPTIMIZER');
 const AmpOptimizer = require('../');
 
@@ -29,6 +30,10 @@ const fetchWithTimout = (url, opts = {}) => {
     controller.abort();
   }, DOWNLOAD_TIMEOUT);
   opts.signal = controller.signal;
+  const httpsProxy = process.env.https_proxy || process.env.HTTPS_PROXY;
+  if (httpsProxy) {
+    opts.agent = new HttpsProxyAgent(httpsProxy);
+  }
   return fetch(url, opts).finally(() => {
     clearTimeout(timeout);
   });

packages/optimizer/package.json

@@ -40,6 +40,7 @@
     "domhandler": "3.0.0",
     "domutils": "2.1.0",
     "htmlparser2": "4.1.0",
+    "https-proxy-agent": "5.0.0",
     "lru-cache": "5.1.1",
     "node-fetch": "2.6.0",
     "normalize-html-whitespace": "1.0.0",