Skip to content

Commit 7546b56

Browse files
committed
deps: @npmcli/[email protected]
1 parent d38fd4f commit 7546b56

File tree

6 files changed

+42
-13
lines changed

6 files changed

+42
-13
lines changed

node_modules/@npmcli/agent/lib/agents.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,10 @@ module.exports = class Agent extends AgentBase {
6565
ProxyAgent = this.isSecureEndpoint(options) ? ProxyAgent[1] : ProxyAgent[0]
6666
}
6767

68-
const proxyAgent = new ProxyAgent(proxy, this.#options)
68+
const proxyAgent = new ProxyAgent(proxy, {
69+
...this.#options,
70+
socketOptions: { family: this.#options.family },
71+
})
6972
proxyCache.set(cacheKey, proxyAgent)
7073

7174
return proxyAgent

node_modules/@npmcli/agent/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@npmcli/agent",
3-
"version": "2.2.1",
3+
"version": "2.2.2",
44
"description": "the http/https agent used by the npm cli",
55
"main": "lib/index.js",
66
"scripts": {
@@ -36,7 +36,7 @@
3636
"http-proxy-agent": "^7.0.0",
3737
"https-proxy-agent": "^7.0.1",
3838
"lru-cache": "^10.0.1",
39-
"socks-proxy-agent": "^8.0.1"
39+
"socks-proxy-agent": "^8.0.3"
4040
},
4141
"devDependencies": {
4242
"@npmcli/eslint-config": "^4.0.0",
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
(The MIT License)
2+
3+
Copyright (c) 2013 Nathan Rajlich <[email protected]>
4+
5+
Permission is hereby granted, free of charge, to any person obtaining
6+
a copy of this software and associated documentation files (the
7+
'Software'), to deal in the Software without restriction, including
8+
without limitation the rights to use, copy, modify, merge, publish,
9+
distribute, sublicense, and/or sell copies of the Software, and to
10+
permit persons to whom the Software is furnished to do so, subject to
11+
the following conditions:
12+
13+
The above copyright notice and this permission notice shall be
14+
included in all copies or substantial portions of the Software.
15+
16+
THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
17+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
18+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
19+
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
20+
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
21+
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
22+
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

node_modules/socks-proxy-agent/dist/index.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ class SocksProxyAgent extends agent_base_1.Agent {
9494
this.shouldLookup = lookup;
9595
this.proxy = proxy;
9696
this.timeout = opts?.timeout ?? null;
97+
this.socketOptions = opts?.socketOptions ?? null;
9798
}
9899
/**
99100
* Initiates a SOCKS connection to the specified SOCKS proxy server,
@@ -128,6 +129,9 @@ class SocksProxyAgent extends agent_base_1.Agent {
128129
},
129130
command: 'connect',
130131
timeout: timeout ?? undefined,
132+
// @ts-expect-error the type supplied by socks for socket_options is wider
133+
// than necessary since socks will always override the host and port
134+
socket_options: this.socketOptions ?? undefined,
131135
};
132136
const cleanup = (tlsSocket) => {
133137
req.destroy();

node_modules/socks-proxy-agent/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "socks-proxy-agent",
3-
"version": "8.0.2",
3+
"version": "8.0.3",
44
"description": "A SOCKS proxy `http.Agent` implementation for HTTP and HTTPS",
55
"main": "./dist/index.js",
66
"types": "./dist/index.d.ts",
@@ -107,7 +107,7 @@
107107
"socks5h"
108108
],
109109
"dependencies": {
110-
"agent-base": "^7.0.2",
110+
"agent-base": "^7.1.1",
111111
"debug": "^4.3.4",
112112
"socks": "^2.7.1"
113113
},

package-lock.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1661,16 +1661,16 @@
16611661
}
16621662
},
16631663
"node_modules/@npmcli/agent": {
1664-
"version": "2.2.1",
1665-
"resolved": "https://registry.npmjs.org/@npmcli/agent/-/agent-2.2.1.tgz",
1666-
"integrity": "sha512-H4FrOVtNyWC8MUwL3UfjOsAihHvT1Pe8POj3JvjXhSTJipsZMtgUALCT4mGyYZNxymkUfOw3PUj6dE4QPp6osQ==",
1664+
"version": "2.2.2",
1665+
"resolved": "https://registry.npmjs.org/@npmcli/agent/-/agent-2.2.2.tgz",
1666+
"integrity": "sha512-OrcNPXdpSl9UX7qPVRWbmWMCSXrcDa2M9DvrbOTj7ao1S4PlqVFYv9/yLKMkrJKZ/V5A/kDBC690or307i26Og==",
16671667
"inBundle": true,
16681668
"dependencies": {
16691669
"agent-base": "^7.1.0",
16701670
"http-proxy-agent": "^7.0.0",
16711671
"https-proxy-agent": "^7.0.1",
16721672
"lru-cache": "^10.0.1",
1673-
"socks-proxy-agent": "^8.0.1"
1673+
"socks-proxy-agent": "^8.0.3"
16741674
},
16751675
"engines": {
16761676
"node": "^16.14.0 || >=18.0.0"
@@ -12173,12 +12173,12 @@
1217312173
}
1217412174
},
1217512175
"node_modules/socks-proxy-agent": {
12176-
"version": "8.0.2",
12177-
"resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.2.tgz",
12178-
"integrity": "sha512-8zuqoLv1aP/66PHF5TqwJ7Czm3Yv32urJQHrVyhD7mmA6d61Zv8cIXQYPTWwmg6qlupnPvs/QKDmfa4P/qct2g==",
12176+
"version": "8.0.3",
12177+
"resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.3.tgz",
12178+
"integrity": "sha512-VNegTZKhuGq5vSD6XNKlbqWhyt/40CgoEw8XxD6dhnm8Jq9IEa3nIa4HwnM8XOqU0CdB0BwWVXusqiFXfHB3+A==",
1217912179
"inBundle": true,
1218012180
"dependencies": {
12181-
"agent-base": "^7.0.2",
12181+
"agent-base": "^7.1.1",
1218212182
"debug": "^4.3.4",
1218312183
"socks": "^2.7.1"
1218412184
},

0 commit comments

Comments
 (0)