Fixup callbacks deadlock when calling callback very frequently

cpp/includes/UniffiCallInvoker.h

@@ -6,6 +6,7 @@
 #pragma once
 #include <ReactCommon/CallInvoker.h>
 #include <condition_variable>
+#include <future>
 #include <jsi/jsi.h>
 #include <memory>
 #include <mutex>
@@ -58,26 +59,19 @@ class UniffiCallInvoker {
     if (std::this_thread::get_id() == threadId_) {
       func(rt);
     } else {
-      std::mutex mtx;
-      std::condition_variable cv;
-      bool done = false;
+      std::promise<void> promise;
+      auto future = promise.get_future();
       // The runtime argument was added to CallFunc in
       // https://github.com/facebook/react-native/pull/43375
       //
       // This can be changed once that change is released.
-      // react::CallFunc wrapper = [&func, &mtx, &cv, &done](jsi::Runtime &rt) {
-      std::function<void()> wrapper = [&func, &rt, &mtx, &cv, &done]() {
+      // react::CallFunc wrapper = [&func, &promise](jsi::Runtime &rt) {
+      std::function<void()> wrapper = [&func, &promise, &rt]() {
         func(rt);
-        {
-          std::lock_guard<std::mutex> lock(mtx);
-          done = true;
-        }
-        cv.notify_one();
+        promise.set_value();
       };
       callInvoker_->invokeAsync(std::move(wrapper));
-
-      std::unique_lock<std::mutex> lock(mtx);
-      cv.wait(lock, [&done] { return done; });
+      future.wait();
     }
   }
 

fixtures/callbacks-regression/Cargo.toml

@@ -0,0 +1,20 @@
+[package]
+name = "uniffi-example-callbacks"
+edition = "2021"
+version = "0.22.0"
+license = "MPL-2.0"
+publish = false
+
+[lib]
+crate-type = ["lib", "cdylib"]
+name = "uniffi_callbacks"
+
+[dependencies]
+uniffi = { workspace = true }
+thiserror = "1.0"
+
+[build-dependencies]
+uniffi = { workspace = true, features = ["build"] }
+
+[dev-dependencies]
+uniffi = { workspace = true, features = ["bindgen-tests"] }

fixtures/callbacks-regression/README.md

@@ -0,0 +1,5 @@
+This is an example of UniFFI "callbacks".
+
+Callbacks are the ability to implement Rust traits in foreign languages. These are defined by
+[normal UniFFI traits](../../docs/manual/src/foreign_traits.md) or via  ["callback" definitions](../../docs/manual/src/udl/callback_interfaces.md).
+

fixtures/callbacks-regression/build.rs

@@ -0,0 +1,7 @@
+/*
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/
+ */
+
+fn main() {}

fixtures/callbacks-regression/src/lib.rs

@@ -0,0 +1,35 @@
+/*
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/
+ */
+
+use std::{sync::Arc, thread::spawn};
+
+uniffi::setup_scaffolding!();
+
+#[uniffi::export(with_foreign)]
+pub trait EventListener: Send + Sync {
+    fn on_event(&self, message: String, number: i32);
+}
+
+#[derive(uniffi::Object)]
+struct EventSource {
+    listener: Arc<dyn EventListener>,
+}
+
+#[uniffi::export]
+impl EventSource {
+    #[uniffi::constructor]
+    fn new(listener: Arc<dyn EventListener>) -> Arc<Self> {
+        Arc::new(Self { listener })
+    }
+    fn start(self: Arc<Self>, message: String, until: i32) {
+        let listener = self.listener.clone();
+        spawn(move || {
+            for i in 0..until {
+                listener.on_event(message.clone(), i);
+            }
+        });
+    }
+}

fixtures/callbacks-regression/tests/bindings/test_callbacks_regression.ts

@@ -0,0 +1,53 @@
+/*
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/
+ */
+
+/*
+fixture=fixtures/callbacks-regression
+cargo xtask run \
+    --crate $fixture \
+    --ts-dir $fixture/generated \
+    --cpp-dir $fixture/generated/cpp \
+    $fixture/tests/bindings/test_callbacks_regression.ts
+*/
+
+import generated, {
+  EventSource,
+  EventListener,
+} from "../../generated/uniffi_callbacks";
+import { asyncTest, AsyncAsserts } from "@/asserts";
+import { console } from "@/hermes";
+
+// This is only needed in tests.
+generated.initialize();
+
+class EventListenerImpl implements EventListener {
+  constructor(
+    private t: AsyncAsserts,
+    private max: number,
+  ) {}
+  onEvent(message: string, number: number): void {
+    // console.log("--", message, number);
+    if (number === this.max - 1) {
+      console.log("-- Done!", this.max);
+      this.t.end();
+    }
+  }
+}
+
+async function testToMax(max: number, t: AsyncAsserts) {
+  const listener = new EventListenerImpl(t, max);
+  const source = new EventSource(listener);
+  source.start(`Going to ${max}, now at:`, max);
+}
+
+(async () => {
+  for (let i = 1; i <= 1024; i *= 2) {
+    await asyncTest(
+      `Full tilt test up to ${i}`,
+      async (t) => await testToMax(i, t),
+    );
+  }
+})();

fixtures/callbacks-regression/tests/test_generated_bindings.rs

@@ -0,0 +1,5 @@
+/*
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/
+ */