Merge branch 'main' into mtls-support

TooTallNate · Sep 4, 2023 · 041a7c5 · 041a7c5
2 parents 89bc0af + dd3b98f
commit 041a7c5
Show file tree

Hide file tree

Showing 13 changed files with 93 additions and 95 deletions.
diff --git a/packages/https-proxy-agent/CHANGELOG.md b/packages/https-proxy-agent/CHANGELOG.md
@@ -1,5 +1,11 @@
 # https-proxy-agent
 
+## 7.0.2
+
+### Patch Changes
+
+- e625d10: Support SNI for proxy servers
+
 ## 7.0.1
 
 ### Patch Changes

diff --git a/packages/https-proxy-agent/package.json b/packages/https-proxy-agent/package.json
@@ -1,6 +1,6 @@
 {
   "name": "https-proxy-agent",
-  "version": "7.0.1",
+  "version": "7.0.2",
   "description": "An HTTP(s) proxy `http.Agent` implementation for HTTPS",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",

diff --git a/packages/https-proxy-agent/src/index.ts b/packages/https-proxy-agent/src/index.ts
@@ -91,7 +91,11 @@ export class HttpsProxyAgent<Uri extends string> extends Agent {
 		let socket: net.Socket;
 		if (proxy.protocol === 'https:') {
 			debug('Creating `tls.Socket`: %o', this.connectOpts);
-			socket = tls.connect(this.connectOpts);
+			const servername = this.connectOpts.servername || this.connectOpts.host;
+			socket = tls.connect({
+				...this.connectOpts,
+				servername: servername && net.isIP(servername) ? undefined : servername
+			});
 		} else {
 			debug('Creating `net.Socket`: %o', this.connectOpts);
 			socket = net.connect(this.connectOpts);

diff --git a/packages/pac-proxy-agent/CHANGELOG.md b/packages/pac-proxy-agent/CHANGELOG.md
@@ -1,5 +1,15 @@
 # pac-proxy-agent
 
+## 7.0.1
+
+### Patch Changes
+
+- 1d39f6c: Fix Electron support by using Node.js native URL object
+- Updated dependencies [1d39f6c]
+- Updated dependencies [e625d10]
+  - [email protected]
+  - [email protected]
+
 ## 7.0.0
 
 ### Major Changes

diff --git a/packages/pac-proxy-agent/package.json b/packages/pac-proxy-agent/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pac-proxy-agent",
-  "version": "7.0.0",
+  "version": "7.0.1",
   "description": "A PAC file proxy `http.Agent` implementation for HTTP",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -36,9 +36,9 @@
     "debug": "^4.3.4",
     "get-uri": "^6.0.1",
     "http-proxy-agent": "^7.0.0",
-    "https-proxy-agent": "^7.0.0",
+    "https-proxy-agent": "^7.0.2",
     "pac-resolver": "^7.0.0",
-    "socks-proxy-agent": "^8.0.1"
+    "socks-proxy-agent": "^8.0.2"
   },
   "devDependencies": {
     "@types/debug": "^4.1.7",

diff --git a/packages/pac-proxy-agent/src/index.ts b/packages/pac-proxy-agent/src/index.ts
@@ -5,7 +5,7 @@ import * as crypto from 'crypto';
 import { once } from 'events';
 import createDebug from 'debug';
 import { Readable } from 'stream';
-import { format } from 'url';
+import { format, URL } from 'url';
 import { Agent, AgentConnectOpts, toBuffer } from 'agent-base';
 import { HttpProxyAgent, HttpProxyAgentOptions } from 'http-proxy-agent';
 import { HttpsProxyAgent, HttpsProxyAgentOptions } from 'https-proxy-agent';

diff --git a/packages/proxy-agent/CHANGELOG.md b/packages/proxy-agent/CHANGELOG.md
@@ -1,5 +1,16 @@
 # proxy-agent
 
+## 6.3.1
+
+### Patch Changes
+
+- 1d39f6c: Fix Electron support by using Node.js native URL object
+- Updated dependencies [1d39f6c]
+- Updated dependencies [e625d10]
+  - [email protected]
+  - [email protected]
+  - [email protected]
+
 ## 6.3.0
 
 ### Minor Changes

diff --git a/packages/proxy-agent/package.json b/packages/proxy-agent/package.json
@@ -1,6 +1,6 @@
 {
   "name": "proxy-agent",
-  "version": "6.3.0",
+  "version": "6.3.1",
   "description": "Maps proxy protocols to `http.Agent` implementations",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -35,11 +35,11 @@
     "agent-base": "^7.0.2",
     "debug": "^4.3.4",
     "http-proxy-agent": "^7.0.0",
-    "https-proxy-agent": "^7.0.0",
+    "https-proxy-agent": "^7.0.2",
     "lru-cache": "^7.14.1",
-    "pac-proxy-agent": "^7.0.0",
+    "pac-proxy-agent": "^7.0.1",
     "proxy-from-env": "^1.1.0",
-    "socks-proxy-agent": "^8.0.1"
+    "socks-proxy-agent": "^8.0.2"
   },
   "devDependencies": {
     "@types/agent-base": "^4.2.0",

diff --git a/packages/proxy-agent/src/index.ts b/packages/proxy-agent/src/index.ts
@@ -1,5 +1,6 @@
 import * as http from 'http';
 import * as https from 'https';
+import { URL } from 'url';
 import LRUCache from 'lru-cache';
 import { Agent, AgentConnectOpts } from 'agent-base';
 import createDebug from 'debug';

diff --git a/packages/socks-proxy-agent/CHANGELOG.md b/packages/socks-proxy-agent/CHANGELOG.md
@@ -1,5 +1,11 @@
 # socks-proxy-agent
 
+## 8.0.2
+
+### Patch Changes
+
+- 1d39f6c: Fix Electron support by using Node.js native URL object
+
 ## 8.0.1
 
 ### Patch Changes
@@ -19,11 +25,11 @@
 
 In version 5.x, the `SocksProxyAgent` constructor took a single argument of either (A) a `string`, or (B) an object with specific connection
 properties.
-    
+
 Now the constructor takes two _separate_ arguments:
 
-* Argument 1: Either (A) a `string`, or (B) a [WHATWG `URL` object](https://nodejs.org/docs/latest-v14.x/api/url.html#url_the_whatwg_url_api)
-* Argument 2 (optional): An object with standard [`http.Agent`](https://nodejs.org/docs/latest-v14.x/api/url.html#url_the_whatwg_url_api)
+- Argument 1: Either (A) a `string`, or (B) a [WHATWG `URL` object](https://nodejs.org/docs/latest-v14.x/api/url.html#url_the_whatwg_url_api)
+- Argument 2 (optional): An object with standard [`http.Agent`](https://nodejs.org/docs/latest-v14.x/api/url.html#url_the_whatwg_url_api)
   properties.
 
 If you were using an object argument in 7.x, you'll need to change the first argument to match the structure of the `URL` class, and move

diff --git a/packages/socks-proxy-agent/package.json b/packages/socks-proxy-agent/package.json
@@ -1,6 +1,6 @@
 {
   "name": "socks-proxy-agent",
-  "version": "8.0.1",
+  "version": "8.0.2",
   "description": "A SOCKS proxy `http.Agent` implementation for HTTP and HTTPS",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",

diff --git a/packages/socks-proxy-agent/src/index.ts b/packages/socks-proxy-agent/src/index.ts
@@ -5,6 +5,7 @@ import * as dns from 'dns';
 import * as net from 'net';
 import * as http from 'http';
 import * as tls from 'tls';
+import { URL } from 'url';
 
 const debug = createDebug('socks-proxy-agent');