Add http & https asset sources

crates/bevy_asset/Cargo.toml

@@ -14,7 +14,7 @@ keywords = ["bevy"]
 file_watcher = ["notify-debouncer-full", "watch"]
 embedded_watcher = ["file_watcher"]
 multi_threaded = ["bevy_tasks/multi_threaded"]
-http_source = ["ureq"]
+http_source = ["ureq", "rustls", "once_cell"]
 http_source_cache = []
 asset_processor = []
 watch = []
@@ -65,10 +65,18 @@ js-sys = "0.3"
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 notify-debouncer-full = { version = "0.4.0", optional = true }
-ureq = { version = "2.10", optional = true, default-features = false, features = [
-  "brotli",
+ureq = { git = "https://github.com/algesten/ureq", rev = "fd82f2bef3c2b2a8eaeaac9aae7ea06ffe7449d3", optional = true, default-features = false, features = [
+  # "rustls", # compiles ok
+  "rustls-no-provider", # breaks compilation
   "gzip",
-  # we should add tls feature when ring gets a cleaner license https://github.com/briansmith/ring/issues/1827
+  "json",
+] }
+once_cell = { version = "1.20", optional = true }
+rustls = { version = "0.23", optional = true, default-features = false, features = [
+  "aws_lc_rs",
+  "logging",
+  "std",
+  "tls12",
 ] }
 
 [dev-dependencies]

crates/bevy_asset/src/http_source.rs

@@ -9,8 +9,8 @@ use std::path::{Path, PathBuf};
 /// Any asset path that begins with `http` or `https` will be loaded from the web
 /// via `fetch`(wasm) or `ureq`(native).
 ///
-/// Due to [licensing complexities](https://github.com/briansmith/ring/issues/1827) 
-/// secure `https` requests are disabled by default in non-wasm builds. 
+/// Due to [licensing complexities](https://github.com/briansmith/ring/issues/1827)
+/// secure `https` requests are disabled by default in non-wasm builds.
 /// To enable add this to your dependencies in Cargo.toml:
 /// ```toml
 /// ureq = { version = "*", features = ["tls"] }
@@ -66,7 +66,7 @@ async fn get<'a>(path: PathBuf) -> Result<Box<dyn Reader>, AssetReaderError> {
 #[cfg(not(target_arch = "wasm32"))]
 async fn get<'a>(path: PathBuf) -> Result<Box<dyn Reader>, AssetReaderError> {
     use crate::io::VecReader;
-    use std::io;
+    use std::io::{self, BufReader, Read};
 
     let str_path = path.to_str().ok_or_else(|| {
         AssetReaderError::Io(
@@ -82,10 +82,34 @@ async fn get<'a>(path: PathBuf) -> Result<Box<dyn Reader>, AssetReaderError> {
     if let Some(data) = http_asset_cache::try_load_from_cache(str_path)? {
         return Ok(Box::new(VecReader::new(data)));
     }
+    use once_cell::sync::Lazy;
+    use ureq::Agent;
+
+    static AGENT: Lazy<Agent> = Lazy::new(|| {
+        use std::sync::Arc;
+        use ureq::{
+            tls::{TlsConfig, TlsProvider},
+            Agent,
+        };
+
+        let crypto = Arc::new(rustls::crypto::aws_lc_rs::default_provider());
+        Agent::config_builder()
+            .tls_config(
+                TlsConfig::builder()
+                    .provider(TlsProvider::Rustls)
+                    // requires rustls or rustls-no-provider feature
+                    .unversioned_rustls_crypto_provider(crypto)
+                    .build(),
+            )
+            .build()
+            .new_agent()
+    });
+
+    match AGENT.get(str_path).call() {
+        Ok(mut response) => {
+            // let mut reader = response.into_reader();
+            let mut reader = BufReader::new(response.body_mut().with_config().reader());
 
-    match ureq::get(str_path).call() {
-        Ok(response) => {
-            let mut reader = response.into_reader();
             let mut buffer = Vec::new();
             reader.read_to_end(&mut buffer)?;
 
@@ -95,14 +119,14 @@ async fn get<'a>(path: PathBuf) -> Result<Box<dyn Reader>, AssetReaderError> {
             Ok(Box::new(VecReader::new(buffer)))
         }
         // ureq considers all >=400 status codes as errors
-        Err(ureq::Error::Status(code, _response)) => {
+        Err(ureq::Error::StatusCode(code)) => {
             if code == 404 {
                 Err(AssetReaderError::NotFound(path))
             } else {
                 Err(AssetReaderError::HttpError(code))
             }
         }
-        Err(ureq::Error::Transport(err)) => Err(AssetReaderError::Io(
+        Err(err) => Err(AssetReaderError::Io(
             io::Error::new(
                 io::ErrorKind::Other,
                 format!(