♻️ Move from async_std to smol

client/Cargo.toml

@@ -32,7 +32,9 @@ eframe = { version = "0.31.1", default-features = false, features = [
 
 # plugins
 async-trait = "0.1.89"
-async-std = "1.12.0"
+smol = "2"
+async-channel = "2"
+futures-lite = "2"
 
 # reading index files
 serde_json = "1.0.139"

client/src/main.rs

@@ -39,7 +39,7 @@ struct Centerpiece {
     query: String,
     active_entry_index: usize,
     plugins: Vec<model::Plugin>,
-    plugin_channels: Vec<async_std::channel::Receiver<Message>>,
+    plugin_channels: Vec<async_channel::Receiver<Message>>,
 }
 
 impl eframe::App for Centerpiece {

client/src/model.rs

@@ -4,7 +4,7 @@ pub struct Plugin {
     pub priority: u32,
     pub title: String,
     pub entries: Vec<Entry>,
-    pub app_channel_out: async_std::channel::Sender<PluginRequest>,
+    pub app_channel_out: async_channel::Sender<PluginRequest>,
 }
 
 #[derive(Debug, Clone, Ord, PartialOrd)]

client/src/plugin/applications.rs

@@ -190,7 +190,7 @@ impl Plugin for ApplicationsPlugin {
     fn activate(
         &mut self,
         entry: crate::model::Entry,
-        plugin_channel_out: &mut async_std::channel::Sender<crate::Message>,
+        plugin_channel_out: &mut async_channel::Sender<crate::Message>,
     ) -> anyhow::Result<()> {
         let command = entry.command.context(format!(
             "Failed to unpack command while activating entry with id '{}'.",

client/src/plugin/brave/bookmarks.rs

@@ -45,7 +45,7 @@ impl Plugin for BookmarksPlugin {
     fn activate(
         &mut self,
         entry: crate::model::Entry,
-        plugin_channel_out: &mut async_std::channel::Sender<crate::Message>,
+        plugin_channel_out: &mut async_channel::Sender<crate::Message>,
     ) -> anyhow::Result<()> {
         std::process::Command::new("brave")
             .arg(&entry.id)

client/src/plugin/brave/history.rs

@@ -73,7 +73,7 @@ impl Plugin for HistoryPlugin {
     fn activate(
         &mut self,
         entry: crate::model::Entry,
-        plugin_channel_out: &mut async_std::channel::Sender<crate::Message>,
+        plugin_channel_out: &mut async_channel::Sender<crate::Message>,
     ) -> anyhow::Result<()> {
         std::process::Command::new("brave")
             .arg(&entry.id)

client/src/plugin/brave/progressive_web_apps.rs

@@ -54,7 +54,7 @@ impl Plugin for ProgressiveWebAppsPlugin {
     fn activate(
         &mut self,
         entry: crate::model::Entry,
-        plugin_channel_out: &mut async_std::channel::Sender<crate::Message>,
+        plugin_channel_out: &mut async_channel::Sender<crate::Message>,
     ) -> anyhow::Result<()> {
         std::process::Command::new("brave")
             .arg(format!("--app={}", entry.id))

client/src/plugin/firefox/bookmarks.rs

@@ -78,7 +78,7 @@ impl Plugin for BookmarksPlugin {
     fn activate(
         &mut self,
         entry: crate::model::Entry,
-        plugin_channel_out: &mut async_std::channel::Sender<crate::Message>,
+        plugin_channel_out: &mut async_channel::Sender<crate::Message>,
     ) -> anyhow::Result<()> {
         std::process::Command::new("firefox")
             .arg(&entry.id)

client/src/plugin/firefox/history.rs

@@ -76,7 +76,7 @@ impl Plugin for HistoryPlugin {
     fn activate(
         &mut self,
         entry: crate::model::Entry,
-        plugin_channel_out: &mut async_std::channel::Sender<crate::Message>,
+        plugin_channel_out: &mut async_channel::Sender<crate::Message>,
     ) -> anyhow::Result<()> {
         std::process::Command::new("firefox")
             .arg(&entry.id)

client/src/plugin/git_repositories.rs

@@ -68,7 +68,7 @@ impl Plugin for GitRepositoriesPlugin {
     fn activate(
         &mut self,
         entry: crate::model::Entry,
-        plugin_channel_out: &mut async_std::channel::Sender<crate::Message>,
+        plugin_channel_out: &mut async_channel::Sender<crate::Message>,
     ) -> anyhow::Result<()> {
         for command in self.settings.plugin.git_repositories.commands.clone() {
             let parsed_command: Vec<String> = command

client/src/plugin/gitmoji.rs

@@ -356,7 +356,7 @@ impl Plugin for GitmojiPlugin {
     fn activate(
         &mut self,
         entry: crate::model::Entry,
-        plugin_channel_out: &mut async_std::channel::Sender<crate::Message>,
+        plugin_channel_out: &mut async_channel::Sender<crate::Message>,
     ) -> anyhow::Result<()> {
         std::process::Command::new("wl-copy")
             .arg(&entry.id)

client/src/plugin/sway_windows.rs

@@ -98,7 +98,7 @@ impl Plugin for SwayWindowsPlugin {
     fn activate(
         &mut self,
         entry: crate::model::Entry,
-        plugin_channel_out: &mut async_std::channel::Sender<crate::Message>,
+        plugin_channel_out: &mut async_channel::Sender<crate::Message>,
     ) -> anyhow::Result<()> {
         self.sway
             .run_command(format!("[con_id={}] focus", entry.id))

client/src/plugin/system.rs

@@ -71,7 +71,7 @@ impl Plugin for SystemPlugin {
     fn activate(
         &mut self,
         entry: crate::model::Entry,
-        plugin_channel_out: &mut async_std::channel::Sender<crate::Message>,
+        plugin_channel_out: &mut async_channel::Sender<crate::Message>,
     ) -> anyhow::Result<()> {
         let command = entry.command.context(format!(
             "Failed to unpack command while activating entry with id '{}'.",

client/src/plugin/utils.rs

@@ -1,26 +1,27 @@
 use anyhow::Context;
-use async_std::stream::StreamExt;
 use nucleo_matcher::{
     Matcher, Utf32Str,
     pattern::{Atom, AtomKind, CaseMatching, Normalization},
 };
 use std::cmp::Reverse;
 
 pub fn spawn<PluginType: Plugin + std::marker::Send + 'static>()
--> async_std::channel::Receiver<crate::Message> {
-    let (plugin_channel_out, app_channel_in) = async_std::channel::bounded(100);
-
-    async_std::task::spawn(async {
-        let mut plugin = PluginType::new();
-
-        let main_loop_result = plugin.main(plugin_channel_out).await;
-        if let Err(error) = main_loop_result {
-            log::error!(
-                target: PluginType::id(),
-                "{:?}", error,
-            );
-            panic!();
-        }
+-> async_channel::Receiver<crate::Message> {
+    let (plugin_channel_out, app_channel_in) = async_channel::bounded(100);
+
+    std::thread::spawn(move || {
+        smol::block_on(async {
+            let mut plugin = PluginType::new();
+
+            let main_loop_result = plugin.main(plugin_channel_out).await;
+            if let Err(error) = main_loop_result {
+                log::error!(
+                    target: PluginType::id(),
+                    "{:?}", error,
+                );
+                panic!();
+            }
+        });
     });
 
     return app_channel_in;
@@ -101,7 +102,7 @@ pub trait Plugin {
 
     fn plugin(
         &self,
-        app_channel_out: &mut async_std::channel::Sender<crate::model::PluginRequest>,
+        app_channel_out: &mut async_channel::Sender<crate::model::PluginRequest>,
     ) -> crate::model::Plugin {
         crate::model::Plugin {
             id: String::from(Self::id()),
@@ -114,11 +115,11 @@ pub trait Plugin {
 
     async fn main(
         &mut self,
-        mut plugin_channel_out: async_std::channel::Sender<crate::Message>,
+        mut plugin_channel_out: async_channel::Sender<crate::Message>,
     ) -> anyhow::Result<()> {
         self.update_entries()?;
 
-        let (mut app_channel_out, mut plugin_channel_in) = async_std::channel::bounded(100);
+        let (mut app_channel_out, mut plugin_channel_in) = async_channel::bounded(100);
         self.register_plugin(&mut plugin_channel_out, &mut app_channel_out)?;
         let mut last_query = String::from("");
 
@@ -134,8 +135,8 @@ pub trait Plugin {
 
     fn register_plugin(
         &mut self,
-        plugin_channel_out: &mut async_std::channel::Sender<crate::Message>,
-        app_channel_out: &mut async_std::channel::Sender<crate::model::PluginRequest>,
+        plugin_channel_out: &mut async_channel::Sender<crate::Message>,
+        app_channel_out: &mut async_channel::Sender<crate::model::PluginRequest>,
     ) -> anyhow::Result<()> {
         plugin_channel_out
             .send_blocking(crate::Message::RegisterPlugin(self.plugin(app_channel_out)))
@@ -146,18 +147,19 @@ pub trait Plugin {
 
     async fn update(
         &mut self,
-        plugin_channel_out: &mut async_std::channel::Sender<crate::Message>,
-        plugin_channel_in: &mut async_std::channel::Receiver<crate::model::PluginRequest>,
+        plugin_channel_out: &mut async_channel::Sender<crate::Message>,
+        plugin_channel_in: &mut async_channel::Receiver<crate::model::PluginRequest>,
         last_query: &mut String,
     ) -> anyhow::Result<()> {
-        let plugin_request_future = plugin_channel_in.next();
         let plugin_request_option = match Self::update_timeout() {
             Some(update_timeout) => {
-                async_std::future::timeout(update_timeout, plugin_request_future)
-                    .await
-                    .unwrap_or(Some(crate::model::PluginRequest::Timeout))
+                futures_lite::future::or(async { plugin_channel_in.recv().await.ok() }, async {
+                    smol::Timer::after(update_timeout).await;
+                    Some(crate::model::PluginRequest::Timeout)
+                })
+                .await
             }
-            None => plugin_request_future.await,
+            None => plugin_channel_in.recv().await.ok(),
         };
         if plugin_request_option.is_none() {
             return Ok(());
@@ -190,7 +192,7 @@ pub trait Plugin {
     fn search(
         &mut self,
         query: &str,
-        plugin_channel_out: &mut async_std::channel::Sender<crate::Message>,
+        plugin_channel_out: &mut async_channel::Sender<crate::Message>,
     ) -> anyhow::Result<()> {
         let filtered_entries = fuzzy_match(query, self.entries());
 
@@ -210,7 +212,7 @@ pub trait Plugin {
     fn activate(
         &mut self,
         _entry: crate::model::Entry,
-        _plugin_channel_out: &mut async_std::channel::Sender<crate::Message>,
+        _plugin_channel_out: &mut async_channel::Sender<crate::Message>,
     ) -> anyhow::Result<()> {
         Ok(())
     }

client/src/plugin/wifi.rs

@@ -133,7 +133,7 @@ impl Plugin for WifiPlugin {
     fn activate(
         &mut self,
         entry: crate::model::Entry,
-        plugin_channel_out: &mut async_std::channel::Sender<crate::Message>,
+        plugin_channel_out: &mut async_channel::Sender<crate::Message>,
     ) -> anyhow::Result<()> {
         let command = entry.command.context(format!(
             "Failed to unpack command while activating entry with id '{}'.",