works

assets/examples/ruby/promises.rb

@@ -1,5 +1,8 @@
 a = get_player_name
 b = a
+puts '0'
 puts a.await
+puts '1'
 puts b.await
+puts '2'
 quit

src/callback.rs

@@ -10,18 +10,18 @@ pub struct CallbackSystem<R: Runtime> {
     pub(crate) arg_types: Vec<TypeId>,
 }
 
-pub(crate) struct FunctionCallEvent<C: Send, V: Send, F: Send> {
+pub(crate) struct FunctionCallEvent<C: Send, V: Send> {
     pub(crate) params: Vec<V>,
-    pub(crate) promise: Promise<C, V, F>,
+    pub(crate) promise: Promise<C, V>,
 }
 
-type Calls<C, V, F> = Arc<Mutex<Vec<FunctionCallEvent<C, V, F>>>>;
+type Calls<C, V> = Arc<Mutex<Vec<FunctionCallEvent<C, V>>>>;
 
 /// A struct representing a Bevy system that can be called from a script.
 pub(crate) struct Callback<R: Runtime> {
     pub(crate) name: String,
     pub(crate) system: Arc<Mutex<CallbackSystem<R>>>,
-    pub(crate) calls: Calls<R::CallContext, R::Value, R::Value>,
+    pub(crate) calls: Calls<R::CallContext, R::Value>,
 }
 
 impl<R: Runtime> Clone for Callback<R> {
@@ -37,7 +37,7 @@ impl<R: Runtime> Clone for Callback<R> {
 impl<R: Runtime> CallbackSystem<R> {
     pub(crate) fn call(
         &mut self,
-        call: &FunctionCallEvent<R::CallContext, R::Value, R::Value>,
+        call: &FunctionCallEvent<R::CallContext, R::Value>,
         world: &mut World,
     ) -> R::Value {
         self.system.run(call.params.clone(), world)

src/lib.rs

@@ -345,8 +345,7 @@ pub trait Runtime: Resource + Default {
         f: impl Fn(
             Self::CallContext,
             Vec<Self::Value>,
-        )
+        ) -> Result<Promise<Self::CallContext, Self::Value>, ScriptingError>
-            -> Result<Promise<Self::CallContext, Self::Value, Self::Value>, ScriptingError>
         + Send
         + Sync
         + 'static,
@@ -376,6 +375,8 @@ pub trait Runtime: Resource + Default {
     fn needs_rdynamic_linking() -> bool {
         false
     }
+
+    fn resume(&self, fiber: &Self::Value, value: &Self::Value);
 }
 
 pub trait FuncArgs<'a, V, R: Runtime> {

src/promise.rs

@@ -1,31 +1,29 @@
 use std::sync::{Arc, Mutex};
 
-use magnus::Fiber;
-
 use crate::{Runtime, ScriptingError};
 
 /// A struct that represents a function that will get called when the Promise is resolved.
-pub(crate) struct PromiseCallback<C: Send, V: Send, F: Send> {
+pub(crate) struct PromiseCallback<C: Send, V: Send> {
     callback: V,
-    following_promise: Arc<Mutex<PromiseInner<C, V, F>>>,
+    following_promise: Arc<Mutex<PromiseInner<C, V>>>,
 }
 
 /// Internal representation of a Promise.
-pub(crate) struct PromiseInner<C: Send, V: Send, F: Send> {
+pub(crate) struct PromiseInner<C: Send, V: Send> {
-    pub(crate) callbacks: Vec<PromiseCallback<C, V, F>>,
+    pub(crate) callbacks: Vec<PromiseCallback<C, V>>,
     #[allow(deprecated)]
     pub(crate) context: C,
     pub(crate) resolved_value: Option<V>,
-    pub(crate) fibers: Vec<F>, // TODO: should htis be vec or option
+    pub(crate) fibers: Vec<V>, // TODO: should htis be vec or option
 }
 
 /// A struct that represents a Promise.
 #[derive(Clone)]
-pub struct Promise<C: Send, V: Send, F: Send> {
+pub struct Promise<C: Send, V: Send> {
-    pub(crate) inner: Arc<Mutex<PromiseInner<C, V, F>>>,
+    pub(crate) inner: Arc<Mutex<PromiseInner<C, V>>>,
 }
 
-impl<C: Send, V: Send + Clone, F: Send + Clone> PromiseInner<C, V, F> {
+impl<C: Send, V: Send + Clone> PromiseInner<C, V> {
     /// Resolve the Promise. This will call all the callbacks that were added to the Promise.
     fn resolve<R>(&mut self, runtime: &mut R, val: R::Value) -> Result<(), ScriptingError>
     where
@@ -45,7 +43,7 @@ impl<C: Send, V: Send + Clone, F: Send + Clone> PromiseInner<C, V, F> {
     }
 }
 
-impl<C: Clone + Send + 'static, V: Send + Clone, F: Send + Clone> Promise<C, V, F> {
+impl<C: Clone + Send + 'static, V: Send + Clone> Promise<C, V> {
     /// Acquire [Mutex] for writing the promise and resolve it. Call will be forwarded to [PromiseInner::resolve].
     pub(crate) fn resolve<R>(
         &mut self,
@@ -55,19 +53,24 @@ impl<C: Clone + Send + 'static, V: Send + Clone, F: Send + Clone> Promise<C, V,
     where
         R: Runtime<Value = V, CallContext = C>,
     {
+        let mut fibers: Vec<V> = vec![];
         if let Ok(mut inner) = self.inner.lock() {
             inner.resolved_value = Some(val.clone());
-            inner.resolve(runtime, val)?;
+            inner.resolve(runtime, val.clone())?;
+
             for fiber in inner.fibers.drain(..) {
-                println!("resume");
+                fibers.push(fiber);
             }
         }
+        for fiber in fibers {
+            runtime.resume(&fiber, &val.clone());
+        }
         Ok(())
     }
 
     /// Register a fiber that will be resumed when the [Promise] is resolved.
     #[cfg(any(feature = "rhai", feature = "lua", feature = "ruby"))]
-    pub(crate) fn await_promise(&mut self, fiber: F) {
+    pub(crate) fn await_promise(&mut self, fiber: V) {
         let mut inner = self
             .inner
             .lock()

src/runtimes/ruby.rs

@@ -7,6 +7,7 @@ use std::{
 };
 
 use ::magnus::{
+    Fiber,
     typed_data::Inspect,
     value::{self, Opaque},
 };
@@ -129,9 +130,9 @@ impl Drop for RubyThread {
     }
 }
 
-impl DataTypeFunctions for Promise<(), RubyValue, RubyValue> {}
+impl DataTypeFunctions for Promise<(), RubyValue> {}
 
-unsafe impl TypedData for Promise<(), RubyValue, RubyValue> {
+unsafe impl TypedData for Promise<(), RubyValue> {
     fn class(ruby: &Ruby) -> magnus::RClass {
         static CLASS: Lazy<RClass> = Lazy::new(|ruby| {
             let class = ruby
@@ -147,12 +148,12 @@ unsafe impl TypedData for Promise<(), RubyValue, RubyValue> {
 
     fn data_type() -> &'static magnus::DataType {
         static DATA_TYPE: DataType =
-            data_type_builder!(Promise<(), RubyValue, RubyValue>, "Bevy::Promise").build();
+            data_type_builder!(Promise<(), RubyValue>, "Bevy::Promise").build();
         &DATA_TYPE
     }
 }
 
-impl TryConvert for Promise<(), RubyValue, RubyValue> {
+impl TryConvert for Promise<(), RubyValue> {
     fn try_convert(val: magnus::Value) -> Result<Self, magnus::Error> {
         let result: Result<&Self, _> = TryConvert::try_convert(val);
         result.cloned()
@@ -160,7 +161,7 @@ impl TryConvert for Promise<(), RubyValue, RubyValue> {
 }
 
 fn then(r_self: magnus::Value) -> magnus::Value {
-    let promise: &Promise<(), RubyValue, RubyValue> =
+    let promise: &Promise<(), RubyValue> =
         TryConvert::try_convert(r_self).expect("Couldn't convert self to Promise");
     let ruby =
         Ruby::get().expect("Failed to get a handle to Ruby API when registering Promise callback");
@@ -179,13 +180,13 @@ fn then(r_self: magnus::Value) -> magnus::Value {
 }
 
 fn await_promise(r_self: magnus::Value) -> magnus::Value {
-    let promise: &Promise<(), RubyValue, RubyValue> =
+    let promise: &Promise<(), RubyValue> =
         TryConvert::try_convert(r_self).expect("Couldn't convert self to Promise");
     let ruby =
         Ruby::get().expect("Failed to get a handle to Ruby API when registering Promise callback");
     let fiber = Opaque::from(ruby.fiber_current().as_value());
     if let Some(value) = &promise.inner.try_lock().unwrap().resolved_value {
-        panic!();
+        return ruby.get_inner(value.0);
     }
     promise.clone().await_promise(RubyValue(fiber)).into_value();
     ruby.fiber_yield::<_, magnus::Value>(()).unwrap()
@@ -451,7 +452,7 @@ impl Runtime for RubyRuntime {
             Self::CallContext,
             Vec<Self::Value>,
         ) -> Result<
-            crate::promise::Promise<Self::CallContext, Self::Value, Self::Value>,
+            crate::promise::Promise<Self::CallContext, Self::Value>,
             crate::ScriptingError,
         > + Send
         + Sync
@@ -461,10 +462,9 @@ impl Runtime for RubyRuntime {
             dyn Fn(
                     (),
                     Vec<RubyValue>,
-                ) -> Result<
+                )
-                    crate::promise::Promise<(), RubyValue, RubyValue>,
+                    -> Result<crate::promise::Promise<(), RubyValue>, crate::ScriptingError>
-                    crate::ScriptingError,
+                + Send,
-                > + Send,
         >;
         static RUBY_CALLBACKS: LazyLock<Mutex<HashMap<String, CallbackClosure>>> =
             LazyLock::new(|| Mutex::new(HashMap::new()));
@@ -553,6 +553,15 @@ impl Runtime for RubyRuntime {
     fn needs_rdynamic_linking() -> bool {
         true
     }
+
+    fn resume(&self, fiber: &Self::Value, value: &Self::Value) {
+        let fiber = fiber.clone();
+        let value = value.clone();
+        self.execute_in_thread(move |ruby| {
+            let fiber: Fiber = TryConvert::try_convert(ruby.get_inner(fiber.0)).unwrap();
+            fiber.resume::<_, magnus::Value>((value.0,));
+        });
+    }
 }
 
 pub mod magnus {

src/systems.rs

@@ -144,7 +144,7 @@ pub(crate) fn process_calls<R: Runtime>(world: &mut World) -> Result<(), Scripti
             .lock()
             .expect("Failed to lock callback calls mutex")
             .drain(..)
-            .collect::<Vec<FunctionCallEvent<R::CallContext, R::Value, R::Value>>>();
+            .collect::<Vec<FunctionCallEvent<R::CallContext, R::Value>>>();
         for mut call in calls {
             tracing::trace!("process_calls: calling '{}'", callback.name);
             let mut system = callback