Skip to content

Commit ff388f3

Browse files
committed
Adopt @vscode/proxy-agent 0.35.0
1 parent bdc4b09 commit ff388f3

6 files changed

Lines changed: 27 additions & 11 deletions

File tree

package-lock.json

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
"@vscode/deviceid": "^0.1.1",
7979
"@vscode/iconv-lite-umd": "0.7.0",
8080
"@vscode/policy-watcher": "^1.3.2",
81-
"@vscode/proxy-agent": "^0.34.0",
81+
"@vscode/proxy-agent": "^0.35.0",
8282
"@vscode/ripgrep": "^1.15.13",
8383
"@vscode/spdlog": "^0.15.2",
8484
"@vscode/sqlite3": "5.1.8-vscode",
@@ -239,4 +239,4 @@
239239
"optionalDependencies": {
240240
"windows-foreground-love": "0.5.0"
241241
}
242-
}
242+
}

remote/package-lock.json

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

remote/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"@parcel/watcher": "parcel-bundler/watcher#1ca032aa8339260a8a3bcf825c3a1a71e3e43542",
99
"@vscode/deviceid": "^0.1.1",
1010
"@vscode/iconv-lite-umd": "0.7.0",
11-
"@vscode/proxy-agent": "^0.34.0",
11+
"@vscode/proxy-agent": "^0.35.0",
1212
"@vscode/ripgrep": "^1.15.13",
1313
"@vscode/spdlog": "^0.15.2",
1414
"@vscode/tree-sitter-wasm": "^0.1.4",

src/vs/platform/request/common/request.ts

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,7 @@ export const USER_LOCAL_AND_REMOTE_SETTINGS = [
156156
'http.systemCertificates',
157157
'http.experimental.systemCertificatesV2',
158158
'http.fetchAdditionalSupport',
159+
'http.experimental.networkInterfaceCheckInterval',
159160
];
160161

161162
let proxyConfiguration: IConfigurationNode[] = [];
@@ -269,6 +270,17 @@ function registerProxyConfigurations(useHostProxy = true, useHostProxyDefault =
269270
default: true,
270271
markdownDescription: localize('fetchAdditionalSupport', "Controls whether Node.js' fetch implementation should be extended with additional support. Currently proxy support ({1}) and system certificates ({2}) are added when the corresponding settings are enabled. When during [remote development](https://aka.ms/vscode-remote) the {0} setting is disabled this setting can be configured in the local and the remote settings separately.", '`#http.useLocalProxyConfiguration#`', '`#http.proxySupport#`', '`#http.systemCertificates#`'),
271272
restricted: true
273+
},
274+
'http.experimental.networkInterfaceCheckInterval': {
275+
type: 'number',
276+
default: 300,
277+
minimum: -1,
278+
tags: ['experimental'],
279+
markdownDescription: localize('networkInterfaceCheckInterval', "Controls the interval in seconds for checking network interface changes to invalidate the proxy cache. Set to -1 to disable. When during [remote development](https://aka.ms/vscode-remote) the {0} setting is disabled this setting can be configured in the local and the remote settings separately.", '`#http.useLocalProxyConfiguration#`'),
280+
restricted: true,
281+
experiment: {
282+
mode: 'auto'
283+
}
272284
}
273285
}
274286
}

src/vs/workbench/api/node/proxyResolver.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,10 @@ export function connectProxyResolver(
7272
},
7373
proxyResolveTelemetry: () => { },
7474
isUseHostProxyEnabled,
75+
getNetworkInterfaceCheckInterval: () => {
76+
const intervalSeconds = getExtHostConfigValue<number>(configProvider, isRemote, 'http.experimental.networkInterfaceCheckInterval', 300);
77+
return intervalSeconds * 1000;
78+
},
7579
loadAdditionalCertificates: async () => {
7680
const promises: Promise<string[]>[] = [];
7781
if (initData.remote.isRemote) {

0 commit comments

Comments
 (0)