mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use Uri.toString() for URLs

Browse Source
This commit is contained in:
wxb1ank 2021-06-14 23:29:38 -04:00
parent 447d849c9e
commit 7a8a72c38f
1 changed files with 7 additions and 5 deletions
Show Stats 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, httpProxy: string | null | undefined,
onProgress: (readBytes: number, totalBytes: number) => void onProgress: (readBytes: number, totalBytes: number) => void
): Promise<void> { ): Promise<void> {
const urlString = url.toString();
const res = await (() => { const res = await (() => {
if (httpProxy) { if (httpProxy) {
log.debug(`Downloading ${url.path} via proxy: ${httpProxy}`); log.debug(`Downloading ${urlString} via proxy: ${httpProxy}`);
return fetch(url.path, { agent: new HttpsProxyAgent(httpProxy) }); return fetch(urlString, { agent: new HttpsProxyAgent(httpProxy) });
} }
return fetch(url.path); return fetch(urlString);
})(); })();
if (!res.ok) { 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 }); log.error({ body: await res.text(), headers: res.headers });
throw new Error(`Got response ${res.status} when trying to download a file.`); 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')); const totalBytes = Number(res.headers.get('content-length'));
assert(!Number.isNaN(totalBytes), "Sanity check of content-length protocol"); 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; let readBytes = 0;
res.body.on("data", (chunk: Buffer) => { res.body.on("data", (chunk: Buffer) => {