fix(weather): fix weather regression with tokio runtime preventing reqwest completing

also add refactor work to config lua watcher

Author: codyduong

hitokage-core/src/components/bar.rs

@@ -135,7 +135,7 @@ pub enum BarMsg {
   LuaHook(BarLuaHook),
 }
 
-#[derive(Debug, Deserialize, Serialize)]
+#[derive(Debug, Deserialize, Serialize, PartialEq, Copy, Clone)]
 pub enum BarPosition {
   Top,
   Bottom,
@@ -205,10 +205,17 @@ impl Component for Bar {
 
         // println!("{:?} {:?}", (model.geometry.height + &model.offset_y), height);
 
-        let _ = komorebi_client::send_message(&komorebi_client::SocketMessage::MonitorWorkAreaOffset(
-          model.index,
-          komorebi_client::Rect { left: 0, top: height, right: 0, bottom: height }
-        ));
+        if (model.position.is_some_and(|pos| pos == BarPosition::Bottom)) {
+          let _ = komorebi_client::send_message(&komorebi_client::SocketMessage::MonitorWorkAreaOffset(
+            model.index,
+            komorebi_client::Rect { left: 0, top: 0, right: 0, bottom: height }
+          ));
+        } else {
+          let _ = komorebi_client::send_message(&komorebi_client::SocketMessage::MonitorWorkAreaOffset(
+            model.index,
+            komorebi_client::Rect { left: 0, top: height, right: 0, bottom: height }
+          ));
+        }
       },
 
       connect_unrealize => move |_window| {

hitokage-lua/src/api/event.rs

@@ -1,13 +1,12 @@
 use hitokage_core::components::app::{LuaHook, LuaHookType};
 use hitokage_core::event::{CONFIG_UPDATE, EVENT, NEW_EVENT};
 use mlua::{Lua, LuaSerdeExt, Value};
-use relm4::prelude::AsyncComponent;
-use relm4::AsyncComponentSender;
+use relm4::{Component, ComponentSender};
 
-pub fn make<C>(lua: &Lua, sender: &AsyncComponentSender<C>) -> anyhow::Result<mlua::Table>
+pub fn make<C>(lua: &Lua, sender: &ComponentSender<C>) -> anyhow::Result<mlua::Table>
 where
-  C: AsyncComponent<Input = crate::AppMsg>,
-  <C as AsyncComponent>::Output: std::marker::Send,
+  C: Component<Input = crate::AppMsg>,
+  <C as Component>::Output: std::marker::Send,
 {
   let table = lua.create_table()?;
 

hitokage-lua/src/components/bar.rs

@@ -14,8 +14,7 @@ use mlua::{
   Lua, LuaSerdeExt, UserData, UserDataMethods,
   Value::{self},
 };
-use relm4::prelude::AsyncComponent;
-use relm4::{AsyncComponentSender, Component, ComponentSender};
+use relm4::{Component, ComponentSender};
 use serde::Deserialize;
 use std::sync::{Arc, Mutex};
 
@@ -135,10 +134,10 @@ impl UserData for BarUserData {
   }
 }
 
-pub fn make<C>(lua: &Lua, sender: &AsyncComponentSender<C>) -> anyhow::Result<mlua::Table>
+pub fn make<C>(lua: &Lua, sender: &ComponentSender<C>) -> anyhow::Result<mlua::Table>
 where
-  C: AsyncComponent<Input = crate::AppMsg>,
-  <C as AsyncComponent>::Output: std::marker::Send,
+  C: Component<Input = crate::AppMsg>,
+  <C as Component>::Output: std::marker::Send,
 {
   let table = lua.create_table()?;
 
@@ -155,7 +154,7 @@ where
 
           let bar_sender: Arc<Mutex<Option<relm4::Sender<BarMsg>>>> = Arc::new(Mutex::new(None));
 
-          sender.input(<C as AsyncComponent>::Input::LuaHook(LuaHook {
+          sender.input(<C as Component>::Input::LuaHook(LuaHook {
             t: LuaHookType::CreateBar(Box::new(monitor.clone()), props, {
               let bar_sender = Arc::clone(&bar_sender);
               {

hitokage-lua/src/lib.rs

@@ -3,7 +3,7 @@ use components::bar;
 use hitokage_core::components::app::AppMsg;
 use luahelper::ValuePrinter;
 use mlua::{AnyUserData, Lua, Table, Value, Variadic};
-use relm4::{prelude::AsyncComponent, AsyncComponentSender};
+use relm4::{Component, ComponentSender};
 use std::fmt;
 
 pub mod api;
@@ -83,10 +83,10 @@ async fn sleep_ms(_: Lua, milliseconds: u64) -> mlua::Result<()> {
   Ok(())
 }
 
-pub fn make<C>(lua: mlua::Lua, sender: AsyncComponentSender<C>) -> anyhow::Result<mlua::Lua>
+pub fn make<C>(lua: mlua::Lua, sender: ComponentSender<C>) -> anyhow::Result<mlua::Lua>
 where
-  C: AsyncComponent<Input = AppMsg>,
-  <C as AsyncComponent>::Output: std::marker::Send,
+  C: Component<Input = AppMsg>,
+  <C as Component>::Output: std::marker::Send,
 {
   {
     let globals = lua.globals();