Skip to content

fix: Code: use Uri.toString() for URLs #9281

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 15, 2021
Merged

fix: Code: use Uri.toString() for URLs #9281

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions editors/code/src/net.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.`);
Expand All @@ -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) => {
Expand Down