user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge #9281

Browse source 
9281: fix: Code: use `Uri.toString()` for URLs r=lnicola a=wxb1ank

I believe this should fix #9280. Testing is needed but I wanted to quickly push a hotfix.

Co-authored-by: wxb1ank <wxblank@gmail.com>
This commit is contained in:
bors[bot] 2021-06-15 06:38:53 +00:00 • committed by GitHub
commit bd8788241d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -127,17 +127,19 @@ async function downloadFile(
httpProxy: string | null | undefined,
onProgress: (readBytes: number, totalBytes: number) => void
): Promise<void> {
const urlString = url.toString();
const res = await (() => {
if (httpProxy) {
log.debug(`Downloading ${url.path} via proxy: ${httpProxy}`);
return fetch(url.path, { agent: new HttpsProxyAgent(httpProxy) });
log.debug(`Downloading ${urlString} via proxy: ${httpProxy}`);
return fetch(urlString, { agent: new HttpsProxyAgent(httpProxy) });
}
return fetch(url.path);
return fetch(urlString);
})();
if (!res.ok) {
log.error("Error", res.status, "while downloading file from", url.path);
log.error("Error", res.status, "while downloading file from", urlString);
log.error({ body: await res.text(), headers: res.headers });
throw new Error(`Got response ${res.status} when trying to download a file.`);
@ -146,7 +148,7 @@ async function downloadFile(
const totalBytes = Number(res.headers.get('content-length'));
assert(!Number.isNaN(totalBytes), "Sanity check of content-length protocol");
log.debug("Downloading file of", totalBytes, "bytes size from", url.path, "to", destFilePath.path);
log.debug("Downloading file of", totalBytes, "bytes size from", urlString, "to", destFilePath.path);
let readBytes = 0;
res.body.on("data", (chunk: Buffer) => {