From 788c238c539a01c3ff062d6545df1e996e51176d Mon Sep 17 00:00:00 2001
From: AkiraFukushima <h3.poteto@gmail.com>
Date: Thu, 26 Mar 2020 23:43:55 +0900
Subject: [PATCH] Update https-proxy-agent version to 5.0.0

---
 package.json        |  2 +-
 src/proxy_config.ts |  7 ++++---
 yarn.lock           | 30 ++++++++++++------------------
 3 files changed, 17 insertions(+), 22 deletions(-)

diff --git a/package.json b/package.json
index 32f8296..82d2d8a 100644
--- a/package.json
+++ b/package.json
@@ -55,7 +55,7 @@
     "@types/oauth": "^0.9.0",
     "@types/ws": "^7.2.0",
     "axios": "^0.19.0",
-    "https-proxy-agent": "^4.0.0",
+    "https-proxy-agent": "^5.0.0",
     "moment": "^2.24.0",
     "oauth": "^0.9.15",
     "socks-proxy-agent": "h3poteto/node-socks-proxy-agent#master",
diff --git a/src/proxy_config.ts b/src/proxy_config.ts
index cda4e7d..8585d1a 100644
--- a/src/proxy_config.ts
+++ b/src/proxy_config.ts
@@ -1,4 +1,4 @@
-import HttpsProxyAgent from 'https-proxy-agent'
+import createHttpsProxyAgent, { HttpsProxyAgent } from 'https-proxy-agent'
 import SocksProxyAgent from 'socks-proxy-agent'
 
 export type ProxyConfig = {
@@ -20,9 +20,10 @@ const proxyAgent = (proxyConfig: ProxyConfig): HttpsProxyAgent | SocksProxyAgent
   }
   switch (proxyConfig.protocol) {
     case 'http':
-    case 'https':
-      const httpsAgent = new HttpsProxyAgent(`${proxyConfig.protocol}://${auth}${proxyConfig.host}:${proxyConfig.port}`)
+    case 'https': {
+      const httpsAgent = createHttpsProxyAgent(`${proxyConfig.protocol}://${auth}${proxyConfig.host}:${proxyConfig.port}`)
       return httpsAgent
+    }
     case 'socks4':
     case 'socks4a':
     case 'socks5':
diff --git a/yarn.lock b/yarn.lock
index 809c4e6..5617cbe 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -665,10 +665,12 @@ acorn@^7.1.0:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.1.0.tgz#949d36f2c292535da602283586c2477c57eb2d6c"
   integrity sha512-kL5CuoXA/dgxlBbVrflsflzQ3PAas7RYZB52NOm/6839iVYJgKMJ3cQJD+t2i5+qFa8h3MDpEOJiS64E8JLnSQ==
 
-agent-base@5:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-5.1.1.tgz#e8fb3f242959db44d63be665db7a8e739537a32c"
-  integrity sha512-TMeqbNl2fMW0nMjTEPOwe3J/PRFP4vqeoNuQMG0HlMrtm5QxKqdvAkZ1pRBQ/ulIyDD5Yq0nJ7YbdD8ey0TO3g==
+agent-base@6:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.0.tgz#5d0101f19bbfaed39980b22ae866de153b93f09a"
+  integrity sha512-j1Q7cSCqN+AwrmDd+pzgqc0/NpC655x2bUf5ZjRIO77DcNBFmh+OgRNzF6OKdCC9RSCb19fGd99+bhXFdkRNqw==
+  dependencies:
+    debug "4"
 
 agent-base@~4.2.1:
   version "4.2.1"
@@ -2089,12 +2091,12 @@ http-signature@~1.2.0:
     jsprim "^1.2.2"
     sshpk "^1.7.0"
 
-https-proxy-agent@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-4.0.0.tgz#702b71fb5520a132a66de1f67541d9e62154d82b"
-  integrity sha512-zoDhWrkR3of1l9QAL8/scJZyLu8j/gBkcwcaQOZh7Gyh/+uJQzGVETdgT30akuwkpL8HTRfssqI3BZuV18teDg==
+https-proxy-agent@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz#e2a90542abb68a762e0a0850f6c9edadfd8506b2"
+  integrity sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==
   dependencies:
-    agent-base "5"
+    agent-base "6"
     debug "4"
 
 human-signals@^1.1.1:
@@ -2778,15 +2780,7 @@ jest-watcher@^25.2.0:
     jest-util "^25.2.0"
     string-length "^3.1.0"
 
-jest-worker@^25.1.0:
-  version "25.2.0"
-  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-25.2.0.tgz#2716fbf74fcae7d713778f60187fd1f96fa09d1a"
-  integrity sha512-oGzUBnVnRdb51Aru3XFNa0zOafAIEerqZoQow+Vy8LDDiy12dvSrOeVeO8oNrxCMkGG4JtXqX9IPC93JJiAk+g==
-  dependencies:
-    merge-stream "^2.0.0"
-    supports-color "^7.0.0"
-
-jest-worker@^25.2.0:
+jest-worker@^25.1.0, jest-worker@^25.2.0:
   version "25.2.0"
   resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-25.2.0.tgz#2716fbf74fcae7d713778f60187fd1f96fa09d1a"
   integrity sha512-oGzUBnVnRdb51Aru3XFNa0zOafAIEerqZoQow+Vy8LDDiy12dvSrOeVeO8oNrxCMkGG4JtXqX9IPC93JJiAk+g==