Use patched async-utility to support task::spawn_blocking also in WASM

Signed-off-by: Yuki Kishimoto <[email protected]>

Author: yukibtc

Cargo.lock

@@ -52,6 +52,7 @@ web-sys = { version = "0.3", default-features = false }
 [patch.crates-io]
 # Patch needed to reduce bindings size
 bip39 = { git = "https://github.com/rust-bitcoin/rust-bip39", rev = "256a00e7c23c5b2ecc04df90894f60248c8d56d5" }
+async-utility = { git = "https://github.com/yukibtc/async-utility", rev = "a232e277162ff60011d54a65a706422c8a9afd06" }
 
 [profile.release]
 lto = true

Cargo.toml

@@ -5,9 +5,9 @@
 
 use std::{fmt, io};
 
+use async_utility::task::Error as JoinError;
 use nostr::{key, secp256k1};
 use nostr_database::flatbuffers;
-use tokio::task::JoinError;
 
 #[derive(Debug)]
 pub enum Error {

crates/nostr-lmdb/src/store/error.rs

@@ -53,7 +53,7 @@ impl Store {
         R: Send + 'static,
     {
         let db = self.db.clone();
-        Ok(task::spawn_blocking(move || f(db)).await?)
+        Ok(task::spawn_blocking(move || f(db)).join().await?)
     }
 
     #[inline]
@@ -65,7 +65,7 @@ impl Store {
         let db = self.db.clone();
         let arc_fbb = self.fbb.clone();
         let mut fbb = arc_fbb.lock_owned().await;
-        Ok(task::spawn_blocking(move || f(db, &mut fbb)).await?)
+        Ok(task::spawn_blocking(move || f(db, &mut fbb)).join().await?)
     }
 
     /// Store an event.

crates/nostr-lmdb/src/store/mod.rs

@@ -5,9 +5,9 @@
 
 use std::{fmt, io};
 
+use async_utility::task::Error as JoinError;
 use nostr::{key, secp256k1};
 use nostr_database::flatbuffers;
-use tokio::task::JoinError;
 
 #[derive(Debug)]
 pub enum Error {

crates/nostr-redb/src/store/error.rs

@@ -63,7 +63,7 @@ impl Store {
         R: Send + 'static,
     {
         let db = self.db.clone();
-        Ok(task::spawn_blocking(move || f(db)).await?)
+        Ok(task::spawn_blocking(move || f(db)).join().await?)
     }
 
     #[inline]
@@ -75,7 +75,7 @@ impl Store {
         let db = self.db.clone();
         let arc_fbb = self.fbb.clone();
         let mut fbb = arc_fbb.lock_owned().await;
-        Ok(task::spawn_blocking(move || f(db, &mut fbb)).await?)
+        Ok(task::spawn_blocking(move || f(db, &mut fbb)).join().await?)
     }
 
     /// Store an event.