development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-06-30 23:04:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Module not shared on Windows?

Browse Source
This commit is contained in:
Christof Marti 2024-06-24 15:08:31 +02:00
parent 3cdb165262
commit 298c72219b
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
extensions/vscode-api-tests/src/singlefolder-tests/proxy.test.ts
View File

@ -8,7 +8,7 @@ import 'mocha';
import { assertNoRpc } from '../utils';
import { pki } from 'node-forge';
import { AddressInfo } from 'net';
import { resetCaches, testCertificates } from '@vscode/proxy-agent';
import { resetCaches } from '@vscode/proxy-agent';
suite('vscode API - network proxy support', () => {
@ -52,8 +52,8 @@ suite('vscode API - network proxy support', () => {
rejectPort(err);
});
// Using `testCertificates` shared between proxyResolver.ts and proxy.test.ts.
testCertificates.splice(0, testCertificates.length, certPEM);
// Using https.globalAgent because it is shared with proxyResolver.ts and mutable.
(https.globalAgent as any).testCertificates = [certPEM];
resetCaches();
try {
@ -69,7 +69,7 @@ suite('vscode API - network proxy support', () => {
.on('error', reject);
});
} finally {
testCertificates.splice(0, testCertificates.length);
delete (https.globalAgent as any).testCertificates;
resetCaches();
server.close();
}

8
src/vs/workbench/api/node/proxyResolver.ts
View File

@ -16,7 +16,7 @@ import { ExtHostExtensionService } from 'vs/workbench/api/node/extHostExtensionS
import { URI } from 'vs/base/common/uri';
import { ILogService, LogLevel as LogServiceLevel } from 'vs/platform/log/common/log';
import { IExtensionDescription } from 'vs/platform/extensions/common/extensions';
import { LogLevel, createHttpPatch, createProxyResolver, createTlsPatch, ProxySupportSetting, ProxyAgentParams, createNetPatch, loadSystemCertificates, testCertificates } from '@vscode/proxy-agent';
import { LogLevel, createHttpPatch, createProxyResolver, createTlsPatch, ProxySupportSetting, ProxyAgentParams, createNetPatch, loadSystemCertificates } from '@vscode/proxy-agent';
const systemCertificatesV2Default = false;
@ -67,10 +67,10 @@ export function connectProxyResolver(
certs.then(certs => extHostLogService.trace('ProxyResolver#loadAdditionalCertificates: Loaded certificates from main process', certs.length));
promises.push(certs);
}
// Using `testCertificates` shared between proxyResolver.ts and proxy.test.ts.
if (initData.environment.extensionTestsLocationURI && testCertificates.length) {
// Using https.globalAgent because it is shared with proxy.test.ts and mutable.
if (initData.environment.extensionTestsLocationURI && (https.globalAgent as any).testCertificates?.length) {
extHostLogService.trace('ProxyResolver#loadAdditionalCertificates: Loading test certificates');
promises.push(Promise.resolve(testCertificates));
promises.push(Promise.resolve((https.globalAgent as any).testCertificates as string[]));
}
return (await Promise.all(promises)).flat();
},