Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2025-01-12 21:28:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

Make extension respect http proxy settings

Browse source
This commit is contained in:
Kam Y. Tse 2021-03-07 17:55:43 +08:00
parent f0b7c02f16
commit 77b7c96aea
No known key found for this signature in database
GPG key ID: FD2B87915048AB4F
5 changed files with 42 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
editors/code/package-lock.json generated
View file

@ -9,6 +9,7 @@
"version": "0.4.0-dev",
"license": "MIT OR Apache-2.0",
"dependencies": {
"https-proxy-agent": "^5.0.0",
"node-fetch": "^2.6.1",
"vscode-languageclient": "^7.1.0-next.4"
},
@ -515,7 +516,6 @@
"version": "6.0.2",
"resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
"integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
"dev": true,
"dependencies": {
"debug": "4"
},
@ -830,6 +830,7 @@
"dependencies": {
"anymatch": "~3.1.1",
"braces": "~3.0.2",
"fsevents": "~2.3.1",
"glob-parent": "~5.1.0",
"is-binary-path": "~2.1.0",
"is-glob": "~4.0.1",
@ -959,7 +960,6 @@
"version": "4.3.1",
"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
"integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
"dev": true,
"dependencies": {
"ms": "2.1.2"
},
@ -1759,7 +1759,6 @@
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
"integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==",
"dev": true,
"dependencies": {
"agent-base": "6",
"debug": "4"
@ -2236,8 +2235,7 @@
"node_modules/ms": {
"version": "2.1.2",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
"dev": true
"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
},
"node_modules/mute-stream": {
"version": "0.0.8",
@ -2682,6 +2680,9 @@
"resolved": "https://registry.npmjs.org/rollup/-/rollup-2.39.1.tgz",
"integrity": "sha512-9rfr0Z6j+vE+eayfNVFr1KZ+k+jiUl2+0e4quZafy1x6SFCjzFspfRSO2ZZQeWeX9noeDTUDgg6eCENiEPFvQg==",
"dev": true,
"dependencies": {
"fsevents": "~2.3.1"
},
"bin": {
"rollup": "dist/bin/rollup"
},
@ -3843,7 +3844,6 @@
"version": "6.0.2",
"resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
"integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
"dev": true,
"requires": {
"debug": "4"
}
@ -4190,7 +4190,6 @@
"version": "4.3.1",
"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
"integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
"dev": true,
"requires": {
"ms": "2.1.2"
}
@ -4798,7 +4797,6 @@
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
"integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==",
"dev": true,
"requires": {
"agent-base": "6",
"debug": "4"
@ -5175,8 +5173,7 @@
"ms": {
"version": "2.1.2",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
"dev": true
"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
},
"mute-stream": {
"version": "0.0.8",

1
editors/code/package.json
View file

@ -35,6 +35,7 @@
"test": "node ./out/tests/runTests.js"
},
"dependencies": {
"https-proxy-agent": "^5.0.0",
"node-fetch": "^2.6.1",
"vscode-languageclient": "^7.1.0-next.4"
},

8
editors/code/src/config.ts
View file

@ -100,6 +100,14 @@ export class Config {
get channel() { return this.get<UpdatesChannel>("updates.channel"); }
get askBeforeDownload() { return this.get<boolean>("updates.askBeforeDownload"); }
get traceExtension() { return this.get<boolean>("trace.extension"); }
get httpProxy() {
const httpProxy = vscode
.workspace
.getConfiguration('http')
.get<null | string>("proxy")!;
return httpProxy || process.env["https_proxy"] || process.env["HTTPS_PROXY"];
}
get inlayHints() {
return {

6
editors/code/src/main.ts
View file

@ -183,7 +183,7 @@ async function bootstrapExtension(config: Config, state: PersistentState): Promi
}
const release = await downloadWithRetryDialog(state, async () => {
return await fetchRelease("nightly", state.githubToken);
return await fetchRelease("nightly", state.githubToken, config.httpProxy);
}).catch(async (e) => {
log.error(e);
if (state.releaseId === undefined) { // Show error only for the initial download
@ -209,6 +209,7 @@ async function bootstrapExtension(config: Config, state: PersistentState): Promi
url: artifact.browser_download_url,
dest,
progressTitle: "Downloading rust-analyzer extension",
httpProxy: config.httpProxy,
});
});
@ -331,7 +332,7 @@ async function getServer(config: Config, state: PersistentState): Promise<string
const releaseTag = config.package.releaseTag;
const release = await downloadWithRetryDialog(state, async () => {
return await fetchRelease(releaseTag, state.githubToken);
return await fetchRelease(releaseTag, state.githubToken, config.httpProxy);
});
const artifact = release.assets.find(artifact => artifact.name === `rust-analyzer-${platform}.gz`);
assert(!!artifact, `Bad release: ${JSON.stringify(release)}`);
@ -343,6 +344,7 @@ async function getServer(config: Config, state: PersistentState): Promise<string
progressTitle: "Downloading rust-analyzer server",
gunzip: true,
mode: 0o755,
httpProxy: config.httpProxy,
});
});

25
editors/code/src/net.ts
View file

@ -1,4 +1,6 @@
import fetch from "node-fetch";
var HttpsProxyAgent = require('https-proxy-agent');
import * as vscode from "vscode";
import * as stream from "stream";
import * as crypto from "crypto";
@ -17,6 +19,7 @@ const REPO = "rust-analyzer";
export async function fetchRelease(
releaseTag: string,
githubToken: string | null | undefined,
httpProxy: string | null | undefined,
): Promise<GithubRelease> {
const apiEndpointPath = `/repos/${OWNER}/${REPO}/releases/tags/${releaseTag}`;
@ -30,7 +33,14 @@ export async function fetchRelease(
headers.Authorization = "token " + githubToken;
}
const response = await fetch(requestUrl, { headers: headers });
const response = await (() => {
if (httpProxy) {
log.debug(`Fetching release metadata via proxy: ${httpProxy}`);
return fetch(requestUrl, { headers: headers, agent: new HttpsProxyAgent(httpProxy) });
}
return fetch(requestUrl, { headers: headers });
})();
if (!response.ok) {
log.error("Error fetching artifact release info", {
@ -73,6 +83,7 @@ interface DownloadOpts {
dest: string;
mode?: number;
gunzip?: boolean;
httpProxy?: string;
}
export async function download(opts: DownloadOpts) {
@ -91,7 +102,7 @@ export async function download(opts: DownloadOpts) {
},
async (progress, _cancellationToken) => {
let lastPercentage = 0;
await downloadFile(opts.url, tempFile, opts.mode, !!opts.gunzip, (readBytes, totalBytes) => {
await downloadFile(opts.url, tempFile, opts.mode, !!opts.gunzip, opts.httpProxy, (readBytes, totalBytes) => {
const newPercentage = Math.round((readBytes / totalBytes) * 100);
if (newPercentage !== lastPercentage) {
progress.report({
@ -113,9 +124,17 @@ async function downloadFile(
destFilePath: fs.PathLike,
mode: number | undefined,
gunzip: boolean,
httpProxy: string | null | undefined,
onProgress: (readBytes: number, totalBytes: number) => void
): Promise<void> {
const res = await fetch(url);
const res = await (() => {
if (httpProxy) {
log.debug(`Downloading ${url} via proxy: ${httpProxy}`);
return fetch(url, { agent: new HttpsProxyAgent(httpProxy) });
}
return fetch(url);
})();
if (!res.ok) {
log.error("Error", res.status, "while downloading file from", url);