chore: update deps

Author: simbleau

Cargo.toml

@@ -5,20 +5,22 @@ license = "Apache-2.0 OR MIT"
 repository = "https://github.com/loopystudios/bevy_key_rotation"
 authors = ["Spencer C. Imbleau"]
 keywords = ["gamedev"]
-version = "0.2.0"
+version = "0.3.0"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [dependencies]
 web-time = "1.1.0"
-thiserror = "1.0.61"
-bevy_async_task = "0.2.0"
-async-trait = "0.1.79"
-bevy = { version = "0.14", default-features = false, features = ["bevy_state"] }
+thiserror = "2.0.3"
+bevy_async_task = "0.3.0"
+async-trait = "0.1.83"
+bevy = { version = "0.15.0", default-features = false, features = [
+  "bevy_state",
+] }
 
 [target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies]
 getrandom = { version = "0.2.15" }
 
 [target.'cfg(target_arch = "wasm32")'.dev-dependencies]
-wasm-bindgen-test = "0.3.42"
+wasm-bindgen-test = "0.3.47"
 getrandom = { version = "0.2.15", features = ["js"] }

README.md

@@ -12,7 +12,8 @@ There is full API support for **wasm** and **native**. Android and iOS are untes
 
 |bevy|bevy_key_rotation|
 |---|---|
-|0.14|0.2, main|
+|0.15|0.3, main|
+|0.14|0.2|
 |0.13|0.1|
 |< 0.13|Unsupported|
 

src/commands.rs

@@ -1,6 +1,5 @@
 use crate::{data_types::Keygen, KeyRotationEvent, Keystore, KeystoreState};
 use bevy::{ecs::world::Command, prelude::*};
-use bevy_async_task::AsyncTask;
 
 struct StartKeyRotation {
     username: String,
@@ -11,13 +10,13 @@ impl Command for StartKeyRotation {
     fn apply(self, world: &mut bevy::prelude::World) {
         info!("starting key rotation, authenticating credentials...");
         let keygen = world.resource::<Keygen>();
-        let keystore = AsyncTask::new({
+
+        let keystore = bevy::tasks::block_on({
             let username = self.username.clone();
             let password = self.password.clone();
             let auth_provider = keygen.0.clone();
             async move { auth_provider.authenticate(username, password).await }
         })
-        .blocking_recv()
         .unwrap();
         info!("credentials authenticated!");
         if keystore.access_token_valid_for() > crate::Duration::ZERO {
@@ -62,10 +61,10 @@ pub trait StartKeyRotationExt {
 
 impl<'w, 's> StartKeyRotationExt for Commands<'w, 's> {
     fn start_key_rotation(&mut self, username: String, password: String) {
-        self.add(StartKeyRotation { username, password })
+        self.queue(StartKeyRotation { username, password })
     }
     fn start_key_rotation_with_keystore(&mut self, keystore: Keystore) {
-        self.add(StartKeyRotationWithKeystore { keystore })
+        self.queue(StartKeyRotationWithKeystore { keystore })
     }
 }
 
@@ -87,6 +86,6 @@ pub trait StopKeyRotationExt {
 
 impl<'w, 's> StopKeyRotationExt for Commands<'w, 's> {
     fn stop_key_rotation(&mut self) {
-        self.add(StopKeyRotation);
+        self.queue(StopKeyRotation);
     }
 }

src/systems.rs

@@ -4,18 +4,19 @@ use crate::{
     Duration, KeystoreState,
 };
 use bevy::prelude::*;
-use bevy_async_task::{AsyncTask, AsyncTaskRunner, AsyncTaskStatus, TimeoutError};
+use bevy_async_task::{AsyncTask, AsyncTaskRunner, TaskError};
+use std::task::Poll;
 
 pub(crate) fn rotate_tokens(
     keygen: Res<Keygen>,
     settings: Res<KeyRotationSettings>,
     mut keystore: ResMut<Keystore>,
-    mut tr_rotate: AsyncTaskRunner<Result<Result<Keystore, TokenRotationError>, TimeoutError>>,
+    mut tr_rotate: AsyncTaskRunner<Result<Result<Keystore, TokenRotationError>, TaskError>>,
     mut event_writer: EventWriter<KeyRotationEvent>,
     mut rotation_timer: Local<Option<Timer>>,
     time: Res<Time>,
 ) {
-    if let AsyncTaskStatus::Finished(resp) = tr_rotate.poll() {
+    if let Poll::Ready(resp) = tr_rotate.poll() {
         match resp {
             Ok(Ok(keys)) => {
                 info!("token rotation successful");
@@ -52,22 +53,20 @@ pub(crate) fn rotate_tokens(
 
     if rtoken_expiring {
         info!("rotating refresh token...");
-        let task = AsyncTask::new({
+        let task = AsyncTask::new_with_timeout(settings.rotation_timeout, {
             let username = keystore.username.clone();
             let password = keystore.password.clone();
             let auth_provider = keygen.0.clone();
             async move { auth_provider.authenticate(username, password).await }
-        })
-        .with_timeout(settings.rotation_timeout);
+        });
         tr_rotate.start(task);
     } else if atoken_expiring {
         info!("rotating access token...");
-        let task = AsyncTask::new({
+        let task = AsyncTask::new_with_timeout(settings.rotation_timeout, {
             let keystore = (*keystore).clone();
             let auth_provider = keygen.0.clone();
             async move { auth_provider.refresh(keystore).await }
-        })
-        .with_timeout(settings.rotation_timeout);
+        });
         tr_rotate.start(task);
     }
 }