Revert migration to hpagent

apify · Aug 19, 2021 · f0fb017 · f0fb017
1 parent 05b47c5
commit f0fb017
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/package.json b/package.json
@@ -12,8 +12,9 @@
     "dependencies": {
         "got-cjs": "12.0.0-beta.4",
         "header-generator": "^1.1.0",
-        "hpagent": "^0.1.2",
+        "http-proxy-agent": "^4.0.1",
         "http2-wrapper": "^2.1.3",
+        "https-proxy-agent": "^5.0.0",
         "ow": "^0.23.0",
         "quick-lru": "^5.1.1"
     },

diff --git a/src/hooks/proxy.ts b/src/hooks/proxy.ts
@@ -2,7 +2,8 @@ import { Agent as HttpAgent } from 'http';
 import { Agent as HttpsAgent } from 'https';
 import { URL } from 'url';
 import { proxies, auto } from 'http2-wrapper';
-import { HttpsProxyAgent, HttpProxyAgent } from 'hpagent';
+import { HttpsProxyAgent } from 'https-proxy-agent';
+import { HttpProxyAgent } from 'http-proxy-agent';
 import QuickLRU from 'quick-lru';
 import { Options } from 'got-cjs';
 import { TransformHeadersAgent } from '../agent/transform-headers-agent';
@@ -110,15 +111,15 @@ async function getAgents(parsedProxyUrl: URL, rejectUnauthorized: boolean) {
             };
         } else {
             agent = {
-                http: fixAgent(new HttpsProxyAgent({ proxy: proxyUrl })),
-                https: fixAgent(new HttpsProxyAgent({ proxy: proxyUrl })),
+                http: fixAgent(new HttpsProxyAgent(proxyUrl.href)),
+                https: fixAgent(new HttpsProxyAgent(proxyUrl.href)),
                 http2: new Http2OverHttps(proxy),
             };
         }
     } else {
         agent = {
-            http: fixAgent(new HttpProxyAgent({ proxy: proxyUrl })),
-            https: fixAgent(new HttpsProxyAgent({ proxy: proxyUrl })),
+            http: fixAgent(new HttpProxyAgent(proxyUrl.href)),
+            https: fixAgent(new HttpsProxyAgent(proxyUrl.href)),
             http2: new Http2OverHttp(proxy),
         };
     }

diff --git a/test/proxy.test.ts b/test/proxy.test.ts
@@ -1,9 +1,7 @@
 import { URL } from 'url';
 import http2 from 'http2-wrapper';
-import {
-    HttpsProxyAgent,
-    HttpProxyAgent,
-} from 'hpagent';
+import { HttpsProxyAgent } from 'https-proxy-agent';
+import { HttpProxyAgent } from 'http-proxy-agent';
 
 import { proxyHook, agentCache } from '../src/hooks/proxy';
 import { TransformHeadersAgent } from '../src/agent/transform-headers-agent';