@@ -14,6 +14,8 @@ use sha2::Digest;
1414use url:: Url ;
1515use zip:: ZipArchive ;
1616
17+ const BUNDLER_USER_AGENT : & str = concat ! ( env!( "CARGO_PKG_NAME" ) , "/" , env!( "CARGO_PKG_VERSION" ) , ) ;
18+
1719fn generate_github_mirror_url_from_template ( github_url : & str ) -> Option < String > {
1820 std:: env:: var ( "TAURI_BUNDLER_TOOLS_GITHUB_MIRROR_TEMPLATE" )
1921 . ok ( )
@@ -47,30 +49,37 @@ fn generate_github_alternative_url(url: &str) -> Option<(ureq::Agent, String)> {
4749
4850 generate_github_mirror_url_from_template ( url)
4951 . or_else ( || generate_github_mirror_url_from_base ( url) )
50- . map ( |alt_url| ( ureq:: agent ( ) , alt_url) )
52+ . map ( |alt_url| {
53+ (
54+ ureq:: Agent :: config_builder ( )
55+ . user_agent ( BUNDLER_USER_AGENT )
56+ . build ( )
57+ . into ( ) ,
58+ alt_url,
59+ )
60+ } )
5161}
5262
5363fn create_agent_and_url ( url : & str ) -> ( ureq:: Agent , String ) {
5464 generate_github_alternative_url ( url) . unwrap_or ( ( base_ureq_agent ( ) , url. to_owned ( ) ) )
5565}
5666
5767pub ( crate ) fn base_ureq_agent ( ) -> ureq:: Agent {
68+ #[ allow( unused_mut) ]
69+ let mut config_builder = ureq:: Agent :: config_builder ( )
70+ . user_agent ( BUNDLER_USER_AGENT )
71+ . proxy ( ureq:: Proxy :: try_from_env ( ) ) ;
72+
5873 #[ cfg( feature = "platform-certs" ) ]
59- let agent : ureq :: Agent = ureq :: Agent :: config_builder ( )
60- . tls_config (
74+ {
75+ config_builder = config_builder . tls_config (
6176 ureq:: tls:: TlsConfig :: builder ( )
6277 . root_certs ( ureq:: tls:: RootCerts :: PlatformVerifier )
6378 . build ( ) ,
64- )
65- . proxy ( ureq:: Proxy :: try_from_env ( ) )
66- . build ( )
67- . into ( ) ;
68- #[ cfg( not( feature = "platform-certs" ) ) ]
69- let agent: ureq:: Agent = ureq:: Agent :: config_builder ( )
70- . proxy ( ureq:: Proxy :: try_from_env ( ) )
71- . build ( )
72- . into ( ) ;
73- agent
79+ ) ;
80+ }
81+
82+ config_builder. build ( ) . into ( )
7483}
7584
7685#[ allow( dead_code) ]
0 commit comments