From 89c51754252e2b6536117a727afe2e8aae25fd17 Mon Sep 17 00:00:00 2001 From: CaiJingLong Date: Fri, 13 Oct 2023 13:35:55 +0800 Subject: [PATCH 1/4] fix(bundler): read http_proxy env when downloading resources. Signed-off-by: CaiJingLong --- .changes/add-proxy-for-nsis-download.md | 5 +++++ tooling/bundler/src/bundle/windows/util.rs | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 .changes/add-proxy-for-nsis-download.md diff --git a/.changes/add-proxy-for-nsis-download.md b/.changes/add-proxy-for-nsis-download.md new file mode 100644 index 00000000000..d14dc16ed48 --- /dev/null +++ b/.changes/add-proxy-for-nsis-download.md @@ -0,0 +1,5 @@ +--- +"tauri-bundler": 'patch:fix' +--- + +Add proxy for NSIS when downloading resources. diff --git a/tooling/bundler/src/bundle/windows/util.rs b/tooling/bundler/src/bundle/windows/util.rs index c23298e3f69..e88d121bc25 100644 --- a/tooling/bundler/src/bundle/windows/util.rs +++ b/tooling/bundler/src/bundle/windows/util.rs @@ -22,7 +22,11 @@ pub const WIX_UPDATER_OUTPUT_FOLDER_NAME: &str = "msi-updater"; pub fn download(url: &str) -> crate::Result> { info!(action = "Downloading"; "{}", url); - let response = ureq::get(url).call().map_err(Box::new)?; + + let agent = ureq::AgentBuilder::new().try_proxy_from_env(true) + .build(); + + let response = agent.get(url).call().map_err(Box::new)?; let mut bytes = Vec::new(); response.into_reader().read_to_end(&mut bytes)?; Ok(bytes) From 6904cb3937b05e72e4b7cdc99ecadcc1d8db7cac Mon Sep 17 00:00:00 2001 From: Amr Bashir Date: Fri, 13 Oct 2023 15:00:30 +0300 Subject: [PATCH 2/4] Update .changes/add-proxy-for-nsis-download.md --- .changes/add-proxy-for-nsis-download.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.changes/add-proxy-for-nsis-download.md b/.changes/add-proxy-for-nsis-download.md index d14dc16ed48..1d93aa1d72a 100644 --- a/.changes/add-proxy-for-nsis-download.md +++ b/.changes/add-proxy-for-nsis-download.md @@ -1,5 +1,3 @@ ---- -"tauri-bundler": 'patch:fix' ---- +"tauri-bundler": 'patch:bug' -Add proxy for NSIS when downloading resources. +Read `HTTP_PROXY` env var when downloading bundling resources on Windows. From a01fea9e8d2d5e23dc47e10eb0412ce6b8aa8cb7 Mon Sep 17 00:00:00 2001 From: Amr Bashir Date: Fri, 13 Oct 2023 15:00:52 +0300 Subject: [PATCH 3/4] Update add-proxy-for-nsis-download.md --- .changes/add-proxy-for-nsis-download.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.changes/add-proxy-for-nsis-download.md b/.changes/add-proxy-for-nsis-download.md index 1d93aa1d72a..db69ef005c5 100644 --- a/.changes/add-proxy-for-nsis-download.md +++ b/.changes/add-proxy-for-nsis-download.md @@ -1,3 +1,5 @@ +--- "tauri-bundler": 'patch:bug' +--- Read `HTTP_PROXY` env var when downloading bundling resources on Windows. From 8cc912302f8895174ab62c88d082ad87ae220d74 Mon Sep 17 00:00:00 2001 From: Amr Bashir Date: Fri, 13 Oct 2023 15:01:45 +0300 Subject: [PATCH 4/4] Update tooling/bundler/src/bundle/windows/util.rs --- tooling/bundler/src/bundle/windows/util.rs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tooling/bundler/src/bundle/windows/util.rs b/tooling/bundler/src/bundle/windows/util.rs index e88d121bc25..96489636ac6 100644 --- a/tooling/bundler/src/bundle/windows/util.rs +++ b/tooling/bundler/src/bundle/windows/util.rs @@ -23,9 +23,7 @@ pub const WIX_UPDATER_OUTPUT_FOLDER_NAME: &str = "msi-updater"; pub fn download(url: &str) -> crate::Result> { info!(action = "Downloading"; "{}", url); - let agent = ureq::AgentBuilder::new().try_proxy_from_env(true) - .build(); - + let agent = ureq::AgentBuilder::new().try_proxy_from_env(true).build(); let response = agent.get(url).call().map_err(Box::new)?; let mut bytes = Vec::new(); response.into_reader().read_to_end(&mut bytes)?;